From 29c2632cab2c575916121fda0273b872ad392204 Mon Sep 17 00:00:00 2001 From: Henrik Lissner Date: Mon, 9 Jul 2018 21:50:19 +0200 Subject: [PATCH] Fix infinite recursion in smerge-mode #745 Also renames +hydra-smerge -> +vc-smerge-hydra, and no longer auto-enables the hydra on smerge-mode (must find a better way). --- modules/emacs/vc/autoload.el | 12 ++++++------ modules/emacs/vc/config.el | 4 +--- 2 files changed, 7 insertions(+), 9 deletions(-) diff --git a/modules/emacs/vc/autoload.el b/modules/emacs/vc/autoload.el index f9e50568f..7460edcba 100644 --- a/modules/emacs/vc/autoload.el +++ b/modules/emacs/vc/autoload.el @@ -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 diff --git a/modules/emacs/vc/config.el b/modules/emacs/vc/config.el index 77325ce17..81e11a600 100644 --- a/modules/emacs/vc/config.el +++ b/modules/emacs/vc/config.el @@ -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))))