summary refs log tree commit diff
diff options
context:
space:
mode:
-rw-r--r--.editorconfig4
-rw-r--r--ChangeLog2
2 files changed, 6 insertions, 0 deletions
diff --git a/.editorconfig b/.editorconfig
index 145dc3740..808512ec0 100644
--- a/.editorconfig
+++ b/.editorconfig
@@ -6,6 +6,10 @@ root = true
 end_of_line = lf
 tab_width   = 8
 indent_size = 2
+indent_style = tab
+
+[ChangeLog]
+indent_size = 8
 
 [*.[ch]]
 indent_size = 4
diff --git a/ChangeLog b/ChangeLog
index 1b5f77cba..53a8ac4ab 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,7 @@
 2014-10-23  Oliver Kiddle  <opk@zsh.org>
 
+	* unposted: .editorconfig: specify 8 char indent for ChangeLog
+
 	* 33519: Src/Zle/zle_move.c, Test/X02zlevi.ztst: last character
 	in the buffer can be cut, changed or yanked using vi-forward-char