summaryrefslogtreecommitdiff
path: root/.editorconfig
diff options
context:
space:
mode:
authorDaniel Mack <github@zonque.org>2016-02-10 13:23:23 +0100
committerDaniel Mack <github@zonque.org>2016-02-10 13:23:23 +0100
commit42caedb2aae782659413f0f50ab824d58065c190 (patch)
tree4d6d0ddd96f65e69da8b4d4c1862bd899be6bce1 /.editorconfig
parent010f81ea6428dce3fbf48f2a695815f027034926 (diff)
parentd5f8b2952a9c24c41f82fc3a12c1b580424566cb (diff)
Merge pull request #2568 from poettering/prepare-229
edit config updates, and a new NEWS file
Diffstat (limited to '.editorconfig')
-rw-r--r--.editorconfig7
1 files changed, 5 insertions, 2 deletions
diff --git a/.editorconfig b/.editorconfig
index 70b6c0f139..e98007c4e8 100644
--- a/.editorconfig
+++ b/.editorconfig
@@ -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
@@ -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