diff options
author | Peter Kokot <peterkokot@gmail.com> | 2019-06-09 22:54:59 +0200 |
---|---|---|
committer | Peter Kokot <peterkokot@gmail.com> | 2019-06-09 22:54:59 +0200 |
commit | 53b0f4ba4ed15f87778b2c49478f2d79fa946713 (patch) | |
tree | 816f58d4c3fd9241532fd62e17018ddc98718642 | |
parent | 15e01132cf6dc1bead1ad8213654415a0cf42d2f (diff) | |
parent | 65ada393602ad6125928c33a5c18dd05c84c29fa (diff) | |
download | php-git-53b0f4ba4ed15f87778b2c49478f2d79fa946713.tar.gz |
Merge branch 'PHP-7.2' into PHP-7.3
* PHP-7.2:
Extend wildcard files section in EditorConfig [ci skip]
-rw-r--r-- | .editorconfig | 33 |
1 files changed, 10 insertions, 23 deletions
diff --git a/.editorconfig b/.editorconfig index ff806cb98a..fae8810f15 100644 --- a/.editorconfig +++ b/.editorconfig @@ -3,45 +3,32 @@ root = true [*] +trim_trailing_whitespace = true +insert_final_newline = true +end_of_line = lf +charset = utf-8 tab_width = 4 -[*.{c,h,y,awk,w32,bat,mk,frag,cpp}] -charset = utf-8 -end_of_line = lf +[{*.{awk,bat,c,cpp,d,h,l,mk,re,skl,w32,y},Makefile*}] indent_size = 4 indent_style = tab -trim_trailing_whitespace = true -insert_final_newline = true -[*.{php,phpt,inc}] -charset = utf-8 -end_of_line = lf +[*.{dtd,html,inc,php,phpt,rng,wsdl,xml,xsd,xsl}] indent_size = 4 indent_style = space -trim_trailing_whitespace = true -insert_final_newline = true -[*.{yml,m4,sh}] -charset = utf-8 -end_of_line = lf +[*.{ac,m4,sh,yml}] indent_size = 2 indent_style = space -trim_trailing_whitespace = true -insert_final_newline = true [*.md] -charset = utf-8 -end_of_line = lf indent_style = space -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 + +[*.patch] +trim_trailing_whitespace = false |