Merge pull request #173 from gilbertw1/fix-smerge-hydra

Check if the hydra feature is enabled before opening smerge hydra
2017-08-09 21:56:23 +02:00 · 2017-08-09 21:56:23 +02:00 · e1f7efdf1d
commit e1f7efdf1d
parent 7877f36f0c c64769c114
1 changed files with 3 additions and 1 deletions
--- a/modules/feature/version-control/autoload.el
+++ b/modules/feature/version-control/autoload.el
@ -45,7 +45,9 @@ repository root."
    (goto-char (point-min))
    (when (re-search-forward "^<<<<<<< " nil :noerror)
      (smerge-mode 1)
-      (when +vcs-auto-hydra-smerge (+hydra-smerge/body)))))
+      (when (and (featurep 'hydra)
+                 +vcs-auto-hydra-smerge)
+        (+hydra-smerge/body)))))

 ;;;###autoload
 (defun +vcs*update-header-line (&rest _)