diff options
| -rw-r--r-- | .dir-locals.el | 6 | ||||
| -rw-r--r-- | .vimrc | 6 | ||||
| -rw-r--r-- | docs/CODING_STYLE.md | 2 | ||||
| -rw-r--r-- | man/.dir-locals.el | 2 |
4 files changed, 8 insertions, 8 deletions
diff --git a/.dir-locals.el b/.dir-locals.el index e3d01b28a9..676d755231 100644 --- a/.dir-locals.el +++ b/.dir-locals.el @@ -2,14 +2,14 @@ ; 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)) @@ -17,7 +17,7 @@ (eval . (c-set-offset 'arglist-intro '++)) (eval . (c-set-offset 'arglist-close 0)))) (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))) @@ -4,7 +4,7 @@ " You should consider setting 'set secure' as well, which is highly " recommended! -" 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. @@ -16,5 +16,5 @@ set shiftwidth=8 set expandtab set makeprg=GCC_COLORS=\ make set tw=79 -au BufRead,BufNewFile *.xml set tw=119 shiftwidth=2 smarttab -au FileType c set tw=119 +au BufRead,BufNewFile *.xml set tw=109 shiftwidth=2 smarttab +au FileType c set tw=109 diff --git a/docs/CODING_STYLE.md b/docs/CODING_STYLE.md index bbc528b140..a91e119c4a 100644 --- a/docs/CODING_STYLE.md +++ b/docs/CODING_STYLE.md @@ -11,7 +11,7 @@ - Don't break code lines too eagerly. We do **not** force line breaks at 80ch, all of today's screens should be much larger than that. But then again, don't - overdo it, ~119ch should be enough really. The `.editorconfig`, `.vimrc` and + overdo it, ~109ch should be enough really. The `.editorconfig`, `.vimrc` and `.dir-locals.el` files contained in the repository will set this limit up for you automatically, if you let them (as well as a few other things). diff --git a/man/.dir-locals.el b/man/.dir-locals.el index 6115b4e8cf..c252bd3703 100644 --- a/man/.dir-locals.el +++ b/man/.dir-locals.el @@ -7,7 +7,7 @@ (eval . (c-set-offset 'arglist-intro '++)) (eval . (c-set-offset 'arglist-close 0)))) (nxml-mode . ((nxml-child-indent . 2) - (fill-column . 119))) + (fill-column . 109))) (meson-mode . ((meson-indent-basic . 8))) (nil . ((indent-tabs-mode . nil) (tab-width . 8) |