search

purescript-emacs / purescript-mode

Emacs major mode and related tools for Purescript
20 stars 10 forks source link

Avoid redefining conflict marker faces from smerge-mode #23

Open Hi-Angel opened 1 month ago

Hi-Angel commented 1 month ago

CC: @chrisdone who authored adding the faces in a469367

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.

Hi-Angel commented 1 month ago

Btw, it turns out this code was removed in 2015 in the haskell-mode this mode is derived from.