Skip to content

Commit

Permalink
editors: only extend line width to 119 for C and XML files
Browse files Browse the repository at this point in the history
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.)
  • Loading branch information
poettering committed Feb 10, 2016
1 parent 9c6d5a1 commit 2eb169b
Show file tree
Hide file tree
Showing 4 changed files with 28 additions and 7 deletions.
15 changes: 12 additions & 3 deletions .dir-locals.el
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,22 @@
; 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
; 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)
(tab-width . 8)
(fill-column . 119)))
(c-mode . ((c-basic-offset . 8)
(fill-column . 79)))
(c-mode . ((fill-column . 119)
(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))))
(nxml-mode . ((nxml-child-indent . 2))))
(nxml-mode . ((nxml-child-indent . 2)
(fill-column . 119))))
7 changes: 5 additions & 2 deletions .editorconfig
Original file line number Diff line number Diff line change
@@ -1,7 +1,10 @@
# EditorConfig configuration for systemd
# 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

# Unix-style newlines with a newline ending every file, utf-8 charset
Expand All @@ -11,7 +14,7 @@ insert_final_newline = true
trim_trailing_whitespace = true
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}]
indent_style = space
indent_size = 8
12 changes: 11 additions & 1 deletion .vimrc
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,18 @@
" vimrc configuration file, including write operations and shell execution.
" 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
" 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 shiftwidth=8
set expandtab
set makeprg=GCC_COLORS=\ make
set tw=119
set tw=79
au FileType xml set tw=119
au FileType c set tw=119
1 change: 0 additions & 1 deletion catalog/systemd.catalog
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
# -*- fill-column: 79; indent-tabs-mode: nil -*-
# This file is part of systemd.
#
# Copyright 2012 Lennart Poettering
Expand Down

0 comments on commit 2eb169b

Please sign in to comment.