From 5d824e2fc0f7bb18c222539ce4cb2785c5a66d9e Mon Sep 17 00:00:00 2001 Message-Id: <5d824e2fc0f7bb18c222539ce4cb2785c5a66d9e.1717664841.git.mdw@distorted.org.uk> From: Mark Wooding Date: Wed, 20 Sep 2017 16:07:23 +0100 Subject: [PATCH] el/dot-emacs.el: Turn on `smerge-mode' if we see conflict markers. Organization: Straylight/Edgeware From: Mark Wooding This seems like generally a good thing. --- el/dot-emacs.el | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/el/dot-emacs.el b/el/dot-emacs.el index c6c038c..c46143c 100644 --- a/el/dot-emacs.el +++ b/el/dot-emacs.el @@ -3979,6 +3979,13 @@ (defun mdw-repolist-column-unpushed-to-upstream (_id) (propertize (number-to-string n) 'face (if (> n 0) 'bold 'shadow)))))) +(defun mdw-try-smerge () + (save-excursion + (goto-char (point-min)) + (when (re-search-forward "^<<<<<<< " nil t) + (smerge-mode 1)))) +(add-hook 'find-file-hook 'mdw-try-smerge t) + ;;;-------------------------------------------------------------------------- ;;; MPC configuration. -- [mdw]