Merge pull request #23 from Hi-Angel/rm-smerge-font-lock-redefinition

Avoid redefining conflict marker faces from smerge-mode
purescript-emacs · Dec 9, 2024 · 794bd94 · 794bd94
2 parents b2184fb + 5bb1da1
commit 794bd94
Showing 1 changed file with 0 additions and 3 deletions.
diff --git a/purescript-font-lock.el b/purescript-font-lock.el
@@ -211,9 +211,6 @@ Returns keywords suitable for `font-lock-keywords'."
     (setq 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-preprocessor-face t)
 
             (,toplevel-keywords 1 (symbol-value 'purescript-keyword-face))