5038df43be
After upgrading to emacs-26.1-1.fc28.x86_64 I noticed that our .dir-locals.el files weren't honoured anymore (specifically the fill column variable is not correctly set for c-mode files). I finally tracked this down to the order in which items are listed in .dir-locals.el: if the "nil" one is listed last everything works, otherwise, it's the one that is applied instead of the c-mode one. This patch simply swaps the entries, and puts the "nil" one last. My emacs lisp fu is a bit too limited to understand the full impact for this, and why emacs 26.1 changed behaviour in this regard, but from an outsider's view the order shouldn't negatively affect things otherwise, hence this patch.
28 lines
1.1 KiB
EmacsLisp
28 lines
1.1 KiB
EmacsLisp
; Sets emacs variables based on mode.
|
|
; A list of (major-mode . ((var1 . value1) (var2 . value2)))
|
|
; Mode can be nil, which gives default values.
|
|
|
|
; Note that we set a line width of 119 for .c and XML files, but for everything
|
|
; else (such as journal catalog files, unit files, README files) we stick to a
|
|
; more conservative 79 characters.
|
|
|
|
; NOTE: If you update this file make sure to update .vimrc and .editorconfig,
|
|
; too.
|
|
|
|
((c-mode . ((fill-column . 119)
|
|
(c-basic-offset . 8)
|
|
(eval . (c-set-offset 'substatement-open 0))
|
|
(eval . (c-set-offset 'statement-case-open 0))
|
|
(eval . (c-set-offset 'case-label 0))
|
|
(eval . (c-set-offset 'arglist-intro '++))
|
|
(eval . (c-set-offset 'arglist-close 0))))
|
|
(nxml-mode . ((nxml-child-indent . 2)
|
|
(fill-column . 119)))
|
|
(meson-mode . ((meson-indent-basic . 8)))
|
|
(sh-mode . ((sh-basic-offset . 8)
|
|
(sh-indentation . 8)))
|
|
(awk-mode . ((c-basic-offset . 8)))
|
|
(nil . ((indent-tabs-mode . nil)
|
|
(tab-width . 8)
|
|
(fill-column . 79))) )
|