From f86beb3c68306da9102633289cd85eca1e1c9736 Mon Sep 17 00:00:00 2001 From: Alexandre Duret-Lutz Date: Sat, 14 Nov 2015 14:12:38 +0100 Subject: [PATCH] workaround bad interactions between magit and whitespace-mode * .dir-locals.el: Use global-whitespace-mode instead of whitespace-mode. --- .dir-locals.el | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.dir-locals.el b/.dir-locals.el index c71a04a4d..248d27bc0 100644 --- a/.dir-locals.el +++ b/.dir-locals.el @@ -1,7 +1,7 @@ ((nil . ((whitespace-action auto-cleanup) (whitespace-style face empty trailing lines-tail) (require-final-newline . t) - (mode . whitespace))) + (mode . global-whitespace))) (c++-mode . ((c-default-style . "gnu") (indent-tab-mode . t) (tab-width . 8)