From 26f0fb110453e99e35bafcc75dd96ec7adb7c3c8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Villemot?= <sebastien@dynare.org> Date: Fri, 5 Apr 2019 15:10:21 +0200 Subject: [PATCH] Fix indentation in Makefiles with Emacs 26 It looks like in Emacs 26, the semantics of .dir-locals.el has changed: overriding the default value of indent-tabs-mode in makefile-mode no longer work. Therefore we no longer set a default value and rather set the variable on a per-mode basis. By the way, remove the setting for fill-column. --- .dir-locals.el | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/.dir-locals.el b/.dir-locals.el index 6dbdc9aed..1ac9c993d 100644 --- a/.dir-locals.el +++ b/.dir-locals.el @@ -1,6 +1,7 @@ -((nil . ((indent-tabs-mode . nil) - (fill-column . 79))) - (c-mode . ((c-file-style . "gnu"))) - (c++-mode . ((c-file-style . "gnu"))) +((c-mode . ((indent-tabs-mode . nil) + (c-file-style . "gnu"))) + (c++-mode . ((indent-tabs-mode . nil) + (c-file-style . "gnu"))) (makefile-mode . ((indent-tabs-mode . t))) - (octave-mode . ((octave-block-offset . 4)))) + (octave-mode . ((indent-tabs-mode . nil) + (octave-block-offset . 4)))) -- GitLab