Skip to content

Commit 56ed241

Browse files
committed
Merge pull request #663 from geraldus/disable-show-identations-by-default
Disable show identations by default
2 parents 59afe94 + cfe5c6e commit 56ed241

File tree

1 file changed

+16
-8
lines changed

1 file changed

+16
-8
lines changed

haskell-indentation.el

Lines changed: 16 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -49,15 +49,16 @@
4949
:group 'haskell
5050
:prefix "haskell-indentation-")
5151

52-
(defcustom haskell-indentation-show-indentations t
52+
(defcustom haskell-indentation-show-indentations nil
5353
"If t the current line's indentation points will be showed as
5454
underscore overlays in new haskell-mode buffers. Use
55-
`haskell-indentation-enable-show-indentations' and `haskell-indentation-disable-show-indentations'
56-
to switch the behavior for already existing buffers."
55+
`haskell-indentation-enable-show-indentations' and
56+
`haskell-indentation-disable-show-indentations' to switch the
57+
behavior for already existing buffers."
5758
:type 'boolean
5859
:group 'haskell-indentation)
5960

60-
(defcustom haskell-indentation-show-indentations-after-eol t
61+
(defcustom haskell-indentation-show-indentations-after-eol nil
6162
"If t, try to show indentation points after the end of line.
6263
This requires strange overlay hacks and can collide with other
6364
modes (e.g. fill-column-indicator)."
@@ -121,7 +122,14 @@ modes (e.g. fill-column-indicator)."
121122
"Haskell indentation mode that deals with the layout rule.
122123
It rebinds RET, DEL and BACKSPACE, so that indentations can be
123124
set and deleted as if they were real tabs. It supports
124-
autofill-mode."
125+
autofill-mode.
126+
127+
It is possible to render indent stops for current line as
128+
overlays. Please read documentation for option
129+
`haskell-indentation-enable-show-indentations' and option
130+
`haskell-indentation-show-indentations-after-eol'. These options
131+
were disabled by default because in most cases occurs overlay
132+
clashing with other modes."
125133
:lighter " Ind"
126134
:keymap haskell-indentation-mode-map
127135
(kill-local-variable 'indent-line-function)
@@ -656,7 +664,7 @@ the current buffer."
656664
(defun haskell-indentation-declaration-layout ()
657665
(haskell-indentation-layout #'haskell-indentation-declaration))
658666

659-
;; a layout list with case expressions
667+
;; a layout list with case expressions
660668
(defun haskell-indentation-case-layout ()
661669
(haskell-indentation-layout #'haskell-indentation-case))
662670

@@ -905,7 +913,7 @@ the current buffer."
905913
(throw 'parse-end nil))
906914

907915
;; after an 'open' expression such as 'if', exit
908-
(unless (member (car parser) '("(" "[" "{" "do" "case"))
916+
(unless (member (car parser) '("(" "[" "{" "do" "case"))
909917
(throw 'return nil)))))))))
910918

911919
(defun haskell-indentation-test-indentations ()
@@ -961,7 +969,7 @@ the current buffer."
961969
;; and current-indent after the separator
962970
;; For example:
963971
;; l = [ 1
964-
;; , 2
972+
;; , 2
965973
;; , -- start now here
966974

967975
(defun haskell-indentation-at-separator ()

0 commit comments

Comments
 (0)