Skip to content

Commit

Permalink
Fix font-lock-warning-face regular expression
Browse files Browse the repository at this point in the history
The regular expression was incorrectly matching `=======` without a
space afterwards, so headings were being incorrectly colored as
warnings.
  • Loading branch information
bryangarza committed Mar 10, 2015
1 parent 6806755 commit f60879a
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion haskell-font-lock.el
Original file line number Diff line number Diff line change
Expand Up @@ -372,7 +372,7 @@ Returns keywords suitable for `font-lock-keywords'."
`(;; NOTICE the ordering below is significant
;;
("^<<<<<<< .*$" 0 'font-lock-warning-face t)
("^=======" 0 'font-lock-warning-face t)
("^======= .*$" 0 'font-lock-warning-face t)
("^>>>>>>> .*$" 0 'font-lock-warning-face t)
("^#.*$" 0 'font-lock-preprocessor-face t)

Expand Down

0 comments on commit f60879a

Please sign in to comment.