shaba/systemd
1
0
Fork 0
mirror of https://github.com/systemd/systemd.git synced 2025-01-03 05:18:09 +03:00
Code

editors: only extend line width to 119 for C and XML files

Browse Source 
For all other files leave the line width at 79 as before. This is a good idea
since we generally don't want text files such as catalog files, unit files or
README/NEWS files to be line-broken at 119 since they are regularly browsed on
text terminals.

While we are at it, also add a couple of comments to the various files.

(Note that .editorconfig doesn't carry line-width information, simply because
the specification doesn't know the concept.)
This commit is contained in:
Lennart Poettering 2016-02-10 12:27:35 +01:00
parent 9c6d5a179e
commit 2eb169bd02
4 changed files with 28 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
.dir-locals.el
View File

@ -2,13 +2,22 @@
; 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
; 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.
((nil . ((indent-tabs-mode . nil) ((nil . ((indent-tabs-mode . nil)
(tab-width . 8) (tab-width . 8)
(fill-column . 119))) (fill-column . 79)))
(c-mode . ((c-basic-offset . 8) (c-mode . ((fill-column . 119)
(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))
(eval . (c-set-offset 'case-label 0)) (eval . (c-set-offset 'case-label 0))
(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))))

7
.editorconfig
View File

@ -1,7 +1,10 @@
# EditorConfig configuration for systemd # EditorConfig configuration for systemd
# http://EditorConfig.org # http://EditorConfig.org
# top-most EditorConfig file # NOTE: If you update this file make sure to update .dir-locals.el and .vimrc,
# too.
# Top-most EditorConfig file
root = true root = true
# Unix-style newlines with a newline ending every file, utf-8 charset # Unix-style newlines with a newline ending every file, utf-8 charset
@ -11,7 +14,7 @@ insert_final_newline = true
trim_trailing_whitespace = true trim_trailing_whitespace = true
charset = utf-8 charset = utf-8
# match config files, set indent to spaces with width of eight # Match config files, set indent to spaces with width of eight
[*.{c,h}] [*.{c,h}]
indent_style = space indent_style = space
indent_size = 8 indent_size = 8

12
.vimrc
View File

@ -3,8 +3,18 @@
" vimrc configuration file, including write operations and shell execution. " vimrc configuration file, including write operations and shell execution.
" 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
" 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 .dir-locals.el and
" .editorconfig, too.
set tabstop=8 set tabstop=8
set shiftwidth=8 set shiftwidth=8
set expandtab set expandtab
set makeprg=GCC_COLORS=\ make set makeprg=GCC_COLORS=\ make
set tw=119 set tw=79
au FileType xml set tw=119
au FileType c set tw=119

1
catalog/systemd.catalog
View File

@ -1,4 +1,3 @@
# -*- fill-column: 79; indent-tabs-mode: nil -*-
# This file is part of systemd. # This file is part of systemd.
# #
# Copyright 2012 Lennart Poettering # Copyright 2012 Lennart Poettering