Merge pull request #14017 from poettering/analyze-calendar-tweaks

[thirdparty/systemd.git] / .dir-locals.el

diff --git a/.dir-locals.el b/.dir-locals.el
index e3d01b28a9790e22943f1f148efe701adc60459b..fde58d65bdded070e091451d8cac4b2a6be38386 100644 (file)
--- a/.dir-locals.el
+++ b/.dir-locals.el
@@ -2,25 +2,26 @@
 ; 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
+; Note that we set a line width of 109 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-mode . ((fill-column . 109)
             (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))))
+            (eval . (c-set-offset 'arglist-close 0))
+            (eval . (c-set-offset 'arglist-cont-nonempty '(c-lineup-gcc-asm-reg c-lineup-arglist)))))
  (nxml-mode . ((nxml-child-indent . 2)
-               (fill-column . 119)))
+               (fill-column . 109)))
  (meson-mode . ((meson-indent-basic . 8)))
- (sh-mode . ((sh-basic-offset . 8)
-             (sh-indentation . 8)))
+ (sh-mode . ((sh-basic-offset . 4)
+             (sh-indentation . 4)))
  (awk-mode . ((c-basic-offset . 8)))
  (nil . ((indent-tabs-mode . nil)
          (tab-width . 8)