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

12
modules/emacs/vc/autoload.el
View file

@ -51,12 +51,12 @@ info in the `header-line-format' is a good indication."
(propertize sha-or-subject 'face 'git-timemachine-minibuffer-detail-face)
date-full date-relative))))
;;;###autoload (autoload '+hydra-smerge/body "emacs/vc/autoload" nil nil)
(defhydra +hydra-smerge (:hint nil
:pre (if (not smerge-mode) (smerge-mode 1))
;; Disable `smerge-mode' when quitting hydra if
;; no merge conflicts remain.
:post (smerge-auto-leave))
;;;###autoload (autoload '+vc-smerge-hydra/body "emacs/vc/autoload" nil t)
(defhydra +vc-smerge-hydra (:hint nil
:pre (if (not smerge-mode) (smerge-mode 1))
;; Disable `smerge-mode' when quitting hydra if
;; no merge conflicts remain.
:post (smerge-auto-leave))
"
[smerge]
Movement Keep Diff Other