Skip to content

Commit 5bb1da1

Browse files
committed
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.
1 parent d187b3d commit 5bb1da1

File tree

1 file changed

+0
-3
lines changed

1 file changed

+0
-3
lines changed

purescript-font-lock.el

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -205,9 +205,6 @@ Returns keywords suitable for `font-lock-keywords'."
205205
(setq keywords
206206
`(;; NOTICE the ordering below is significant
207207
;;
208-
("^<<<<<<< .*$" 0 'font-lock-warning-face t)
209-
("^=======" 0 'font-lock-warning-face t)
210-
("^>>>>>>> .*$" 0 'font-lock-warning-face t)
211208
("^#.*$" 0 'font-lock-preprocessor-face t)
212209

213210
(,reservedid 1 (symbol-value 'purescript-keyword-face))

0 commit comments

Comments
 (0)