Skip to content

Enable adaptive-fill-mode #1319

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
May 8, 2016
Merged

Enable adaptive-fill-mode #1319

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
83f46b9
Enable adaptive-fill-mode
rasendubi May 8, 2016
e3cfd09
Fix fill-comment tests with respect to adaptive-fill-mode
rasendubi May 8, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion haskell-mode.el
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -793,7 +793,6 @@ Minor modes that work well with `haskell-mode':
(setq-local paragraph-separate (concat " *$\\| *\\({-\\|-}\\) *$\\|" page-delimiter))
(setq-local fill-paragraph-function 'haskell-fill-paragraph)
;; (setq-local adaptive-fill-function 'haskell-adaptive-fill)
(setq-local adaptive-fill-mode nil)
(setq-local comment-start "-- ")
(setq-local comment-padding 0)
(setq-local comment-start-skip "[-{]-[ \t]*")
Expand Down
8 changes: 3 additions & 5 deletions tests/haskell-mode-tests.el
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -297,8 +297,8 @@ the beginning of the buffer.

(ert-deftest fill-comment-2 ()
(check-fill '("{- a b c d e"
"f g h i j"
"k -}")
" f g h i j"
" k -}")
'("{- @a b c d e f g h i j k -}")))

(ert-deftest fill-comment-3 ()
Expand All @@ -322,7 +322,7 @@ the beginning of the buffer.
(ert-deftest fill-comment-5 ()
(check-fill '(" {-"
" a b c d e"
"f g h i"
" f g h i"
" -}")
'(" {-" " @a b c d e f g h i" " -}")))

Expand Down Expand Up @@ -398,7 +398,6 @@ Also should respect 10 column fill."
as defined, just the content should move properly.

Also should respect 10 column fill."
:expected-result :failed
(check-fill '(" -- a b"
" -- c d e"
" -- f g h"
Expand All @@ -412,7 +411,6 @@ as defined, just the content should move properly. Following
lines should take position from second line.

Also should respect 10 column fill."
:expected-result :failed
(check-fill '(" -- a b"
" -- c d e"
" -- f g h"
Expand Down