From 44865d11f64c795f39cd2a915e359f3f9d39acf1 Mon Sep 17 00:00:00 2001 From: Bryan Garza Date: Wed, 11 Mar 2015 11:01:51 -0700 Subject: [PATCH] Correct marker regexes `>>>>>>>` and `<<<<<<<` have text after, but `|||||||` and `=======` do not. --- haskell-font-lock.el | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/haskell-font-lock.el b/haskell-font-lock.el index 2df19b805..932b8336f 100644 --- a/haskell-font-lock.el +++ b/haskell-font-lock.el @@ -372,7 +372,8 @@ 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) ; "diff3" style + ("^=======$" 0 'font-lock-warning-face t) ("^>>>>>>> .*$" 0 'font-lock-warning-face t) ("^#.*$" 0 'font-lock-preprocessor-face t)