awesome-emacs/doomemacs
1
0
Fork 0
mirror of https://github.com/doomemacs/doomemacs synced 2025-08-01 12:17:25 -05:00
Code Issues Packages Projects Releases 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
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))))