awesome-emacs/doomemacs
1
0
Fork 0
mirror of https://github.com/doomemacs/doomemacs synced 2025-08-03 12:27:26 -05:00
Code Issues Packages Projects Releases Wiki Activity

Check if the hydra feature is enabled before opening smerge hydra

Browse Source
This commit is contained in:
Bryan Gilbert
2017-08-09 11:56:12 -04:00
parent 7877f36f0c
commit c64769c114
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
modules/feature/version-control/autoload.el
View File

@ -45,7 +45,9 @@ repository root."
(goto-char (point-min)) (goto-char (point-min))
(when (re-search-forward "^<<<<<<< " nil :noerror) (when (re-search-forward "^<<<<<<< " nil :noerror)
(smerge-mode 1) (smerge-mode 1)
(when +vcs-auto-hydra-smerge (+hydra-smerge/body))))) (when (and (featurep 'hydra)
+vcs-auto-hydra-smerge)
(+hydra-smerge/body)))))
;;;###autoload ;;;###autoload
(defun +vcs*update-header-line (&rest _) (defun +vcs*update-header-line (&rest _)