Merge pull request #484 from karljs/haddock-comments

Fix Haddock comment start regexp

Author: gracjan

haskell-font-lock.el

@@ -567,7 +567,7 @@ that should be commented under LaTeX-style literate scripts."
    ((and haskell-font-lock-haddock
          (save-excursion
            (goto-char (nth 8 state))
-           (or (looking-at "[{-]-[ \\t]*[|^*]")
+           (or (looking-at "\\(?:{- ?\\|-- \\)[|^*$]")
                (and haskell-font-lock-seen-haddock
                     (looking-at "--")
                     (let ((doc nil)