From c64769c1148c20003c9e86007ad56682a3dfc14f Mon Sep 17 00:00:00 2001 From: Bryan Gilbert Date: Wed, 9 Aug 2017 11:56:12 -0400 Subject: [PATCH] Check if the hydra feature is enabled before opening smerge hydra --- modules/feature/version-control/autoload.el | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/modules/feature/version-control/autoload.el b/modules/feature/version-control/autoload.el index 4383233f7..ee921133a 100644 --- 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 _)