Skip to content

Remove auto-fill code from indentation #945

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
Oct 18, 2015
Merged

Remove auto-fill code from indentation #945

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
e472e32
Remove auto-fill code from indentation
gracjan Oct 17, 2015
4d06cd5
Set comment-auto-fill-only-comments t
gracjan Oct 18, 2015
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
22 changes: 3 additions & 19 deletions haskell-indentation.el
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -138,8 +138,7 @@ positions are allowed."
(define-minor-mode haskell-indentation-mode
"Haskell indentation mode that deals with the layout rule.
It rebinds RET, DEL and BACKSPACE, so that indentations can be
set and deleted as if they were real tabs. It supports
`auto-fill-mode'.
set and deleted as if they were real tabs.

It is possible to render indent stops for current line as
overlays. Please read documentation for option
Expand All @@ -150,14 +149,13 @@ clashing with other modes."
:keymap haskell-indentation-mode-map
(kill-local-variable 'indent-line-function)
(kill-local-variable 'indent-region-function)
(kill-local-variable 'normal-auto-fill-function)

(when haskell-indentation-mode
(set (make-local-variable 'indent-line-function)
'haskell-indentation-indent-line)
(set (make-local-variable 'indent-region-function)
'haskell-indentation-indent-region)
(set (make-local-variable 'normal-auto-fill-function)
'haskell-indentation-auto-fill-function)

(when haskell-indentation-show-indentations
(haskell-indentation-enable-show-indentations))))

Expand Down Expand Up @@ -187,20 +185,6 @@ NIL otherwise."
;;----------------------------------------------------------------------------
;; UI starts here

(defun haskell-indentation-auto-fill-function ()
"" ; FIXME
(when (> (current-column) fill-column)
(while (> (current-column) fill-column)
(skip-syntax-backward "-")
(skip-syntax-backward "^-"))
(let ((indent (car (last (haskell-indentation-find-indentations-safe)))))
(delete-horizontal-space)
(newline)
(when (haskell-indentation-bird-p)
(insert ">"))
(indent-to indent)
(end-of-line))))

(defun haskell-indentation-reindent-to (col &optional move)
"Reindent current line to COL, move the point there if MOVE is non-NIL."
(let* ((ci (haskell-indentation-current-indentation)))
Expand Down
1 change: 1 addition & 0 deletions haskell-mode.el
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -678,6 +678,7 @@ Minor modes that work well with `haskell-mode':
;; TABs stops are 8 chars apart, as mandated by the Haskell Report. --Stef
(set (make-local-variable 'indent-tabs-mode) nil)
(set (make-local-variable 'tab-width) 8)
(set (make-local-variable 'comment-auto-fill-only-comments) t)
;; Haskell is not generally suitable for electric indentation, since
;; there is no unambiguously correct indent level for any given line.
(when (boundp 'electric-indent-inhibit)
Expand Down