From 8303454123302a2538591e8f867ce0188a20596d Mon Sep 17 00:00:00 2001 From: Correl Roush Date: Wed, 7 Aug 2013 13:18:32 -0400 Subject: [PATCH] [emacs] Disable git-gutter when running ediff --- .emacs.d/init.el | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/.emacs.d/init.el b/.emacs.d/init.el index ba7a82d..9bd970f 100644 --- a/.emacs.d/init.el +++ b/.emacs.d/init.el @@ -29,6 +29,15 @@ ;; Git Gutter (global-git-gutter-mode t) +(defadvice ediff-make-temp-file (before make-temp-file-suspend-ll + activate compile preactivate) + "Disable git-gutter when running ediff" + (global-git-gutter-mode 0)) + +(add-hook 'ediff-cleanup-hook + '(lambda () + (global-git-gutter-mode t))) + ;; Fixes an issue with ECB ;; (setq stack-trace-on-error t)