Merge branch 'master' into improve-cabal-comments

Author: purcell

haskell-c2hs.el

@@ -34,12 +34,12 @@
 (add-to-list 'auto-mode-alist '("\\.chs\\'" . haskell-c2hs-mode))
 
 (defface haskell-c2hs-hook-pair-face
-  '((t (:inherit 'font-lock-preprocessor-face)))
+  '((t (:inherit font-lock-preprocessor-face)))
   "Face for highlighting {#...#} pairs."
   :group 'haskell)
 
 (defface haskell-c2hs-hook-name-face
-  '((t (:inherit 'font-lock-keyword-face)))
+  '((t (:inherit font-lock-keyword-face)))
   "Face for highlighting c2hs hook names."
   :group 'haskell)
 

haskell-cabal.el

@@ -175,7 +175,7 @@ it from list if one of the following conditions are hold:
   (add-hook 'change-major-mode-hook 'haskell-cabal-unregister-buffer nil 'local)
   (add-hook 'kill-buffer-hook 'haskell-cabal-unregister-buffer nil 'local)
   (setq-local comment-start "--")
-  (setq-local comment-start-skip "\\(^[ \t]*\\)--[ \t]*")
+  (setq-local comment-start-skip "--[ \t]*")
   (setq-local comment-end "")
   (setq-local comment-end-skip "[ \t]*\\(\\s>\\|\n\\)")
   (setq-local indent-line-function 'haskell-cabal-indent-line)

haskell-commands.el

@@ -46,7 +46,7 @@
 (defcustom haskell-mode-stylish-haskell-args nil
   "Arguments to pass to program specified by haskell-mode-stylish-haskell-path."
   :group 'haskell
-  :type 'list)
+  :type '(list string))
 
 (defcustom haskell-interactive-set-+c
   t