Skip to content

Commit 4b40810

Browse files
committed
Merge branch 'mg/editorconfig-makefile'
The .editorconfig file has been taught that a Makefile uses HT indentation. * mg/editorconfig-makefile: editorconfig: add Makefiles to "text files"
2 parents 58dd7e4 + b45602e commit 4b40810

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

.editorconfig

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ insert_final_newline = true
44

55
# The settings for C (*.c and *.h) files are mirrored in .clang-format. Keep
66
# them in sync.
7-
[*.{c,h,sh,perl,pl,pm,txt}]
7+
[{*.{c,h,sh,perl,pl,pm,txt},config.mak.*,Makefile}]
88
indent_style = tab
99
tab_width = 8
1010

0 commit comments

Comments
 (0)