Turn off adaptive fill, until it's fixed

Ignore-this: d3dd3a72d822968211b7c736889a8792

darcs-hash:20091128172449-f57bf-488039b6c5343d6952cdc3e569904a98b1ef58be.gz

Author: svein.ove

haskell-mode.el

@@ -445,6 +445,9 @@ Use `haskell-version' to find out what version this is.
 Invokes `haskell-mode-hook'."
   (set (make-local-variable 'paragraph-start) (concat "^$\\|" page-delimiter))
   (set (make-local-variable 'paragraph-separate) paragraph-start)
+  (set (make-local-variable 'fill-paragraph-function) 'haskell-fill-paragraph)
+  ;; (set (make-local-variable 'adaptive-fill-function) 'haskell-adaptive-fill)
+  (set (make-local-variable 'adaptive-fill-mode) nil)
   (set (make-local-variable 'comment-start) "-- ")
   (set (make-local-variable 'comment-padding) 0)
   (set (make-local-variable 'comment-start-skip) "[-{]-[ \t]*")
@@ -474,6 +477,30 @@ Invokes `haskell-mode-hook'."
   (set (make-local-variable 'tab-width) 8)
   (setq haskell-literate nil))
 
+(defun in-comment () (nth 4 (syntax-ppss)))
+
+(defun haskell-fill-paragraph (justify)
+  (save-excursion
+    ;; We don't want to reflow code.
+    (unless (in-comment)
+      (end-of-line)) ; Try to get inside a comment
+    (if (in-comment) nil t)))
+
+;; (defun haskell-adaptive-fill ()
+;;   ;; We want to use "--  " as the prefix of "-- |", etc.
+;;   (let* ((line-end (save-excursion (end-of-line) (point)))
+;;          (line-start (point)))
+;;     (save-excursion
+;;       (unless (in-comment)
+;;         ;; Try to find the start of a comment. We only fill comments.
+;;         (search-forward-regexp comment-start-skip line-end t))
+;;       (when (in-comment)
+;;         (let ();(prefix-start (point)))
+;;           (skip-syntax-forward "^w")
+;;           (make-string (- (point) line-start) ?\s))))))
+          
+
+
 ;;;###autoload
 (define-derived-mode literate-haskell-mode haskell-mode "LitHaskell"
   "As `haskell-mode' but for literate scripts."

haskell-site-file.el

@@ -13,7 +13,7 @@ Major mode for Haskell FFI files.
 ;;;***
 
 ;;;### (autoloads (haskell-cabal-mode) "haskell-cabal" "haskell-cabal.el"
-;;;;;;  (19171 22843))
+;;;;;;  (19206 35523))
 ;;; Generated autoloads from haskell-cabal.el
 
 (add-to-list 'auto-mode-alist '("\\.cabal\\'" . haskell-cabal-mode))
@@ -26,7 +26,7 @@ Major mode for Cabal package description files.
 ;;;***
 
 ;;;### (autoloads (haskell-decl-scan-mode) "haskell-decl-scan" "haskell-decl-scan.el"
-;;;;;;  (19184 11012))
+;;;;;;  (19206 35523))
 ;;; Generated autoloads from haskell-decl-scan.el
 
 (autoload 'haskell-decl-scan-mode "haskell-decl-scan" "\
@@ -76,7 +76,7 @@ Invokes `haskell-decl-scan-mode-hook'.
 ;;;***
 
 ;;;### (autoloads (haskell-doc-show-type haskell-doc-mode) "haskell-doc"
-;;;;;;  "haskell-doc.el" (19171 22859))
+;;;;;;  "haskell-doc.el" (19206 35819))
 ;;; Generated autoloads from haskell-doc.el
 
 (autoload 'haskell-doc-mode "haskell-doc" "\
@@ -99,15 +99,16 @@ current buffer.
 ;;;***
 
 ;;;### (autoloads (haskell-indent-mode) "haskell-indent" "haskell-indent.el"
-;;;;;;  (19171 22857))
+;;;;;;  (19206 35819))
 ;;; Generated autoloads from haskell-indent.el
 
 (autoload 'haskell-indent-mode "haskell-indent" "\
-``intelligent'' Haskell indentation mode that deals with
-the layout rule of Haskell.  \\[haskell-indent-cycle] starts the cycle
-which proposes new possibilities as long as the TAB key is pressed.
-Any other key or mouse click terminates the cycle and is interpreted
-except for RET which merely exits the cycle.
+``Intelligent'' Haskell indentation mode.
+This deals with the layout rule of Haskell.
+\\[haskell-indent-cycle] starts the cycle which proposes new
+possibilities as long as the TAB key is pressed.  Any other key
+or mouse click terminates the cycle and is interpreted except for
+RET which merely exits the cycle.
 Other special keys are:
     \\[haskell-indent-insert-equal]
       inserts an =
@@ -130,7 +131,7 @@ Invokes `haskell-indent-hook' if not nil.
 ;;;***
 
 ;;;### (autoloads (haskell-indentation-mode) "haskell-indentation"
-;;;;;;  "haskell-indentation.el" (19183 7319))
+;;;;;;  "haskell-indentation.el" (19216 1488))
 ;;; Generated autoloads from haskell-indentation.el
 
 (autoload 'haskell-indentation-mode "haskell-indentation" "\
@@ -144,7 +145,7 @@ autofill-mode.
 ;;;***
 
 ;;;### (autoloads (haskell-hayoo haskell-hoogle literate-haskell-mode
-;;;;;;  haskell-mode) "haskell-mode" "haskell-mode.el" (19184 9020))
+;;;;;;  haskell-mode) "haskell-mode" "haskell-mode.el" (19217 23751))
 ;;; Generated autoloads from haskell-mode.el
 
 (add-to-list 'load-path (or (file-name-directory load-file-name) (car load-path)))
@@ -212,8 +213,8 @@ Do a Hayoo search for QUERY.
 
 ;;;### (autoloads (inferior-haskell-find-haddock inferior-haskell-find-definition
 ;;;;;;  inferior-haskell-info inferior-haskell-type inferior-haskell-load-file
-;;;;;;  switch-to-haskell) "inf-haskell" "inf-haskell.el" (19181
-;;;;;;  47090))
+;;;;;;  switch-to-haskell) "inf-haskell" "inf-haskell.el" (19214
+;;;;;;  18334))
 ;;; Generated autoloads from inf-haskell.el
 
 (defalias 'run-haskell 'switch-to-haskell)
@@ -267,8 +268,8 @@ we load it.
 ;;;***
 
 ;;;### (autoloads nil nil ("haskell-font-lock.el" "haskell-ghci.el"
-;;;;;;  "haskell-hugs.el" "haskell-simple-indent.el") (19189 20651
-;;;;;;  303543))
+;;;;;;  "haskell-hugs.el" "haskell-simple-indent.el") (19217 23753
+;;;;;;  561352))
 
 ;;;***
 

indent.hs

@@ -5,9 +5,22 @@
 -- are uselessly proposed.                                             --
 -------------------------------------------------------------------------
 
+-- | Fill-paragraph should avoid inserting an | on the following lines.
+
+  -- | However, indented comments should still be indented. For great justice.
+
+-- * Foo bar bazFoo bar bazFoo bar bazFoo bar bazFoo bar bazFoo bar baz
+
+{- Here's
+a more complex comment. Of doom. There is, indeed, great doom here. #-}
+
+-- And a
+-- multi-line
+-- comment
+
 -- compute the list of binary digits corresponding to an integer
 -- Note: the least significant bit is the first element of the list
-bdigits               :: Int -> [Int]
+bdigits               :: Int -> [Int]   -- | commented to oblivion and back and forth and so forth
 bdigits 0             = [0]
 bdigits 1             = [1]
 bdigits n | n>1       = n `mod` 2 :