summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKyle Meyer <kyle@kyleam.com>2018-08-25 19:50:04 -0400
committerKyle Meyer <kyle@kyleam.com>2018-08-25 20:13:21 -0400
commit330252b3069b33508600ead70c8dbae553fc76a3 (patch)
treec226e01b0db0bcaa0f614d455a4476920e9b64d5
parent9ef1f9b8454c6a4fe83d14bb9bbb7c11bf6ea0b6 (diff)
downloademacs.d-330252b3069b33508600ead70c8dbae553fc76a3.tar.gz
smerge: Check that flycheck-mode is loaded before disabling
-rw-r--r--init.el2
1 files changed, 1 insertions, 1 deletions
diff --git a/init.el b/init.el
index afbdde2..851ee68 100644
--- a/init.el
+++ b/init.el
@@ -909,7 +909,7 @@
(add-hook 'smerge-mode-hook
(lambda ()
(if smerge-mode
- (when flycheck-mode
+ (when (bound-and-true-p flycheck-mode)
(setq km/smerge-restore-flycheck t)
(flycheck-mode -1))
(when km/smerge-restore-flycheck