coding style: reduce text width to 109 characters

Patches are shown on github with a fixed width (no matter how wide the window
is). When line numbers are high (we have some files with 5 digit line numbers),
the diff does not fit, and horizontal scrolling must be used when viewing the
patch. This is super annoying. Let's reduce the width a bit. I think 109 is
still very wide, but at least the github issue should be alleviated.
This commit is contained in:
Zbigniew Jędrzejewski-Szmek 2018-12-06 15:45:19 +01:00 committed by Yu Watanabe
parent 99b5b0d0ef
commit c90ee83400
4 changed files with 8 additions and 8 deletions

View file

@ -2,14 +2,14 @@
; A list of (major-mode . ((var1 . value1) (var2 . value2))) ; A list of (major-mode . ((var1 . value1) (var2 . value2)))
; Mode can be nil, which gives default values. ; 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 ; else (such as journal catalog files, unit files, README files) we stick to a
; more conservative 79 characters. ; more conservative 79 characters.
; NOTE: If you update this file make sure to update .vimrc and .editorconfig, ; NOTE: If you update this file make sure to update .vimrc and .editorconfig,
; too. ; too.
((c-mode . ((fill-column . 119) ((c-mode . ((fill-column . 109)
(c-basic-offset . 8) (c-basic-offset . 8)
(eval . (c-set-offset 'substatement-open 0)) (eval . (c-set-offset 'substatement-open 0))
(eval . (c-set-offset 'statement-case-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-intro '++))
(eval . (c-set-offset 'arglist-close 0)))) (eval . (c-set-offset 'arglist-close 0))))
(nxml-mode . ((nxml-child-indent . 2) (nxml-mode . ((nxml-child-indent . 2)
(fill-column . 119))) (fill-column . 109)))
(meson-mode . ((meson-indent-basic . 8))) (meson-mode . ((meson-indent-basic . 8)))
(sh-mode . ((sh-basic-offset . 8) (sh-mode . ((sh-basic-offset . 8)
(sh-indentation . 8))) (sh-indentation . 8)))

6
.vimrc
View file

@ -4,7 +4,7 @@
" You should consider setting 'set secure' as well, which is highly " You should consider setting 'set secure' as well, which is highly
" recommended! " 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 " else (such as journal catalog files, unit files, README files) we stick to a
" more conservative 79 characters. " more conservative 79 characters.
@ -16,5 +16,5 @@ set shiftwidth=8
set expandtab set expandtab
set makeprg=GCC_COLORS=\ make set makeprg=GCC_COLORS=\ make
set tw=79 set tw=79
au BufRead,BufNewFile *.xml set tw=119 shiftwidth=2 smarttab au BufRead,BufNewFile *.xml set tw=109 shiftwidth=2 smarttab
au FileType c set tw=119 au FileType c set tw=109

View file

@ -11,7 +11,7 @@
- Don't break code lines too eagerly. We do **not** force line breaks at 80ch, - 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 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 `.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). you automatically, if you let them (as well as a few other things).

View file

@ -7,7 +7,7 @@
(eval . (c-set-offset 'arglist-intro '++)) (eval . (c-set-offset 'arglist-intro '++))
(eval . (c-set-offset 'arglist-close 0)))) (eval . (c-set-offset 'arglist-close 0))))
(nxml-mode . ((nxml-child-indent . 2) (nxml-mode . ((nxml-child-indent . 2)
(fill-column . 119))) (fill-column . 109)))
(meson-mode . ((meson-indent-basic . 8))) (meson-mode . ((meson-indent-basic . 8)))
(nil . ((indent-tabs-mode . nil) (nil . ((indent-tabs-mode . nil)
(tab-width . 8) (tab-width . 8)