From 3361a82e0e2f00d321eb9d6962dc86e0a7d59847 Mon Sep 17 00:00:00 2001 From: Gracjan Polak Date: Sun, 22 Mar 2015 16:58:38 +0100 Subject: [PATCH] Direct users to smerge-mode for conflict markers. --- haskell-font-lock.el | 4 ---- haskell-mode.el | 7 ++++++- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/haskell-font-lock.el b/haskell-font-lock.el index ca4e4e135..e4982b75e 100644 --- a/haskell-font-lock.el +++ b/haskell-font-lock.el @@ -321,10 +321,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) ; "diff3" style - ("^=======$" 0 'font-lock-warning-face t) - ("^>>>>>>> .*$" 0 'font-lock-warning-face t) ("^#.*$" 0 'font-lock-preprocessor-face t) ,@(haskell-font-lock-symbols-keywords) diff --git a/haskell-mode.el b/haskell-mode.el index 85d05a6a4..fd0ff4691 100644 --- a/haskell-mode.el +++ b/haskell-mode.el @@ -639,7 +639,12 @@ Use `haskell-version' to find out what version of Haskell mode you are currently using. Additional Haskell mode modules can be hooked in via `haskell-mode-hook'; -see documentation for that variable for more details." +see documentation for that variable for more details. + +Minor modes that work well with `haskell-mode': + +- `smerge-mode': show and work with diff3 conflict markers used + by git, svn and other version control systems." :group 'haskell ;; paragraph-{start,separate} should treat comments as paragraphs as well. (set (make-local-variable 'paragraph-start)