Skip to content

Commit 80d8204

Browse files
committed
editor: update formatting rules from systemd
1 parent 8e2f11c commit 80d8204

File tree

3 files changed

+16
-8
lines changed

3 files changed

+16
-8
lines changed

.dir-locals.el

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -5,16 +5,20 @@
55
; NOTE: If you update this file make sure to update .vimrc and .editorconfig,
66
; too.
77

8-
((nil . ((indent-tabs-mode . nil)
9-
(tab-width . 8)
10-
(fill-column . 79)))
11-
(c-mode . ((fill-column . 119)
8+
((c-mode . ((fill-column . 109)
129
(c-basic-offset . 8)
1310
(eval . (c-set-offset 'substatement-open 0))
1411
(eval . (c-set-offset 'statement-case-open 0))
1512
(eval . (c-set-offset 'case-label 0))
1613
(eval . (c-set-offset 'arglist-intro '++))
1714
(eval . (c-set-offset 'arglist-close 0))))
1815
(nxml-mode . ((nxml-child-indent . 2)
19-
(fill-column . 119)))
20-
(meson-mode . ((meson-indent-basic . 8))))
16+
(fill-column . 109)))
17+
(meson-mode . ((meson-indent-basic . 8)))
18+
(sh-mode . ((sh-basic-offset . 8)
19+
(sh-indentation . 8)))
20+
(awk-mode . ((c-basic-offset . 8)))
21+
(nil . ((indent-tabs-mode . nil)
22+
(tab-width . 8)
23+
(fill-column . 79)))
24+
)

.editorconfig

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,3 +18,7 @@ charset = utf-8
1818
[*.{c,h}]
1919
indent_style = space
2020
indent_size = 8
21+
22+
[meson.build]
23+
indent_style = space
24+
indent_size = 8

.vimrc

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,5 +12,5 @@ set shiftwidth=8
1212
set expandtab
1313
set makeprg=GCC_COLORS=\ make
1414
set tw=79
15-
au BufRead,BufNewFile *.xml set tw=119 shiftwidth=2 smarttab
16-
au FileType c set tw=119
15+
au BufRead,BufNewFile *.xml set tw=109 shiftwidth=2 smarttab
16+
au FileType c set tw=109

0 commit comments

Comments
 (0)