From 330252b3069b33508600ead70c8dbae553fc76a3 Mon Sep 17 00:00:00 2001
From: Kyle Meyer <kyle@kyleam.com>
Date: Sat, 25 Aug 2018 19:50:04 -0400
Subject: smerge: Check that flycheck-mode is loaded before disabling

---
 init.el | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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
-- 
cgit v1.2.3