chiark
/
gitweb
/
~mdw
/
profile
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(from parent 1:
70b2697
)
el/dot-emacs.el: Turn on `smerge-mode' if we see conflict markers.
author
Mark Wooding
<mdw@distorted.org.uk>
Wed, 20 Sep 2017 15:07:23 +0000
(16:07 +0100)
committer
Mark Wooding
<mdw@distorted.org.uk>
Wed, 20 Sep 2017 15:49:30 +0000
(16:49 +0100)
This seems like generally a good thing.
el/dot-emacs.el
patch
|
blob
|
blame
|
history
diff --git
a/el/dot-emacs.el
b/el/dot-emacs.el
index c6c038c7bcd14b2c70698c1b6fb3e2271ba84877..c46143c62432a07c22386db00b2996f7bfab7eda 100644
(file)
--- 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.