Skip to content

Commit

Permalink
Avoid redefining conflict marker faces from smerge-mode
Browse files Browse the repository at this point in the history
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.
  • Loading branch information
Hi-Angel committed Oct 8, 2024
1 parent d187b3d commit 5bb1da1
Showing 1 changed file with 0 additions and 3 deletions.
3 changes: 0 additions & 3 deletions purescript-font-lock.el
Original file line number Diff line number Diff line change
Expand Up @@ -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))
Expand Down

0 comments on commit 5bb1da1

Please sign in to comment.