Merge pull request #958 from gracjan/pr-remove-haskell-simple-indent

Remove horizontal whitespace based smart indentation mode haskell-simple-indent

Author: gracjan

Makefile

@@ -69,7 +69,6 @@ ELFILES = \
 	haskell-process.el \
 	haskell-repl.el \
 	haskell-session.el \
-	haskell-simple-indent.el \
 	haskell-sort-imports.el \
 	haskell-string.el \
 	haskell-unicode-input-method.el \

doc/haskell-mode.texi

@@ -350,12 +350,6 @@ trade-offs:
 
 @ftable @code
 
-@item haskell-simple-indent-mode
-
-A very simple indentation scheme; In this scheme, @key{TAB} will now
-move the cursor to the next indent point in the previous non-blank line.
-An indent point is a non-whitespace character following whitespace.
-
 @item haskell-indent-mode
 
 Intelligent semi-automatic indentation for Haskell's layout rule.  The
@@ -386,7 +380,6 @@ convenient user interface or by adding @emph{one} of the following three
 lines to your @file{.emacs} file:
 
 @lisp
-(add-hook 'haskell-mode-hook 'haskell-simple-indent-mode)
 (add-hook 'haskell-mode-hook 'haskell-indent-mode)
 (add-hook 'haskell-mode-hook 'haskell-indentation-mode)
 @end lisp

haskell-mode.el

@@ -600,9 +600,6 @@ Indentation modes:
     `haskell-indent-mode', Guy Lapalme
       Intelligent semi-automatic indentation.
 
-    `haskell-simple-indent-mode', Graeme E Moss and Heribert Schuetz
-      Simple indentation.
-
 Interaction modes:
 
     `interactive-haskell-mode'

haskell-simple-indent.el

@@ -28,7 +28,6 @@
 (require 'haskell-font-lock)
 (require 'haskell-indentation)
 (require 'haskell-indent)
-(require 'haskell-simple-indent)
 
 ;;; Code:
 
@@ -132,19 +131,6 @@ macro quotes them for you."
     (should-not haskell-indentation-mode)
     (should haskell-indent-mode)))
 
-(ert-deftest haskell-indentation-turns-off-haskell-simple-indent ()
-  (with-temp-buffer
-    (haskell-mode)
-    (haskell-simple-indent-mode)
-    (should haskell-simple-indent-mode)
-    (haskell-indentation-mode)
-    (should haskell-indentation-mode)
-    (should-not haskell-simple-indent-mode)
-
-    (haskell-simple-indent-mode)
-    (should-not haskell-indentation-mode)
-    (should haskell-simple-indent-mode)))
-
 (hindent-test "1 Check if '{' on its own line gets properly indented""
 function = Record
        { field = 123 }"