Skip to content

Direct users to smerge-mode for conflict markers. #543

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Mar 28, 2015
Merged

Direct users to smerge-mode for conflict markers. #543

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 0 additions & 4 deletions haskell-font-lock.el
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
7 changes: 6 additions & 1 deletion haskell-mode.el
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down