Merge pull request #499 from bryangarza/font-lock-warning-face

Fix font-lock-warning-face regular expression for git merge conflict markers
haskell · Mar 10, 2015 · 7fa3158 · 7fa3158
2 parents 6806755 + f60879a
commit 7fa3158
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/haskell-font-lock.el b/haskell-font-lock.el
@@ -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)