emenel/doomemacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Fix infinite recursion in smerge-mode #745

Browse source 
Also renames +hydra-smerge -> +vc-smerge-hydra, and no longer
auto-enables the hydra on smerge-mode (must find a better way).
This commit is contained in:
Henrik Lissner 2018-07-09 21:50:19 +02:00
parent 6829f6fca2
commit 29c2632cab
No known key found for this signature in database
GPG key ID: 5F6C0EA160557395
2 changed files with 7 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

4
modules/emacs/vc/config.el
View file

@ -56,7 +56,5 @@
(defalias #'smerge-keep-lower #'smerge-keep-other)
(defalias #'smerge-diff-base-upper #'smerge-diff-base-mine)
(defalias #'smerge-diff-upper-lower #'smerge-diff-mine-other)
(defalias #'smerge-diff-base-lower #'smerge-diff-base-other)))
(add-hook 'smerge-mode-hook #'+hydra-smerge/body))
(defalias #'smerge-diff-base-lower #'smerge-diff-base-other))))