summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKyle Meyer <kyle@kyleam.com>2018-08-04 10:06:21 -0400
committerKyle Meyer <kyle@kyleam.com>2018-08-04 10:06:21 -0400
commit190db0199159f448c6c3d4f50d5b330bcec033a2 (patch)
treefa66b0c81255fe7498a8200cf7fd53f1df219066
parentcd55a78a858922a6470725ee058e608190503640 (diff)
downloademacs.d-190db0199159f448c6c3d4f50d5b330bcec033a2.tar.gz
smerge: Disable flycheck
-rw-r--r--init.el13
1 files changed, 12 insertions, 1 deletions
diff --git a/init.el b/init.el
index 02c9b49..7289924 100644
--- a/init.el
+++ b/init.el
@@ -899,7 +899,18 @@
(use-package smerge-mode
:config
- (setq smerge-diff-switches '("-d" "-b" "-u")))
+ (setq smerge-diff-switches '("-d" "-b" "-u"))
+
+ (defvar-local km/smerge-restore-flycheck nil)
+ (add-hook 'smerge-mode-hook
+ (lambda ()
+ (if smerge-mode
+ (when flycheck-mode
+ (setq km/smerge-restore-flycheck t)
+ (flycheck-mode -1))
+ (when km/smerge-restore-flycheck
+ (setq km/smerge-restore-flycheck nil)
+ (flycheck-mode 1))))))
(use-package git-annex
:config