diff options
| author | Andres Gomez <agomez@igalia.com> | 2020-07-22 23:00:41 +0300 |
|---|---|---|
| committer | Marge Bot <eric+marge@anholt.net> | 2020-07-30 22:22:56 +0000 |
| commit | ef47be35ec8c30b1c3f7c5ef90f01b7ccf6fa38a (patch) | |
| tree | 7d394b4f4b203c289f6f5eff61194accc77ad82c /.dir-locals.el | |
| parent | 9f28c855258e1a2e720bc30756d57741bb1b561d (diff) | |
dir-locals.el: move nil block to the bottom
The order of the blocks matter. If "nil" is the first, later modes
won't overwrite variables already defined.
Additionally, whitespace variables won't take effect if the mode is
not yet activated.
Signed-off-by: Andres Gomez <agomez@igalia.com>
Acked-by: Ilia Mirkin <imirkin@alum.mit.edu>
Part-of: <https://gitlab.freedesktop.org/mesa/piglit/-/merge_requests/347>
Diffstat (limited to '.dir-locals.el')
| -rw-r--r-- | .dir-locals.el | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/.dir-locals.el b/.dir-locals.el index 2a37aaf44..e4aba2827 100644 --- a/.dir-locals.el +++ b/.dir-locals.el @@ -1,9 +1,4 @@ -((nil . ((indent-tabs-mode . t) - (tab-width . 8) - (show-trailing-whitespace . t) - (whitespace-style face indentation) - (whitespace-line-column . 79))) - (prog-mode . +((prog-mode . ((c-file-style . "linux") (eval ignore-errors (require 'whitespace) @@ -17,4 +12,9 @@ ((indent-tabs-mode . nil) (tab-width . 4) (whitespace-line-column . 80))) + (nil . ((indent-tabs-mode . t) + (tab-width . 8) + (show-trailing-whitespace . t) + (whitespace-style face indentation) + (whitespace-line-column . 79))) ) |