From 5bb1da1291e340e3c3dc51fc6a856635a2025568 Mon Sep 17 00:00:00 2001 From: Konstantin Kharlamov Date: Tue, 8 Oct 2024 12:46:19 +0300 Subject: [PATCH] Avoid redefining conflict marker faces from smerge-mode Whenever conflicts appear in Emacs buffer, they get handled by smerge-mode. The mode isn't enabled by default, but it gets turned on upon conflict markers entering the buffer. There's no point in redefining what's already handled by Emacs. --- purescript-font-lock.el | 3 --- 1 file changed, 3 deletions(-) diff --git a/purescript-font-lock.el b/purescript-font-lock.el index 85d4b7d..9d6b65a 100644 --- a/purescript-font-lock.el +++ b/purescript-font-lock.el @@ -205,9 +205,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) (,reservedid 1 (symbol-value 'purescript-keyword-face))