summaryrefslogtreecommitdiff
path: root/.editorconfig
diff options
context:
space:
mode:
authorPeter Kokot <peterkokot@gmail.com>2019-02-17 14:21:58 +0100
committerPeter Kokot <peterkokot@gmail.com>2019-03-07 01:03:56 +0100
commit488544b3362ede214dec32439c54aaded4bf57d7 (patch)
treebee4ec646af18b292ff7cb02ecd7a3bf76ac73dd /.editorconfig
parent41fb0eaa116da34fa531437d5b87ca73089e4944 (diff)
downloadphp-git-488544b3362ede214dec32439c54aaded4bf57d7.tar.gz
Update editorconfig
Changes: - New property max_line_length - COMMIT_EDITMSG file added when writing commit messages - Markdown files can have trimmed trailing whitespace also to simplify settings. - https link used to EditorConfig page. - Added also *.y, *.cpp, and *.inc files - The tab_width moved to a new all files section
Diffstat (limited to '.editorconfig')
-rw-r--r--.editorconfig22
1 files changed, 17 insertions, 5 deletions
diff --git a/.editorconfig b/.editorconfig
index 30a6d69035..ff806cb98a 100644
--- a/.editorconfig
+++ b/.editorconfig
@@ -1,17 +1,19 @@
-# http://editorconfig.org/
+# https://editorconfig.org/
root = true
-[*.{c,h,awk,w32,bat,mk,frag}]
+[*]
+tab_width = 4
+
+[*.{c,h,y,awk,w32,bat,mk,frag,cpp}]
charset = utf-8
end_of_line = lf
indent_size = 4
indent_style = tab
-tab_width = 4
trim_trailing_whitespace = true
insert_final_newline = true
-[*.{php,phpt}]
+[*.{php,phpt,inc}]
charset = utf-8
end_of_line = lf
indent_size = 4
@@ -31,5 +33,15 @@ insert_final_newline = true
charset = utf-8
end_of_line = lf
indent_style = space
-trim_trailing_whitespace = false
+trim_trailing_whitespace = true
+insert_final_newline = true
+max_line_length = 80
+
+[COMMIT_EDITMSG]
+charset = utf-8
+end_of_line = lf
+indent_size = 4
+indent_style = space
+trim_trailing_whitespace = true
insert_final_newline = true
+max_line_length = 80