about summary refs log tree commit diff
diff options
context:
space:
mode:
-rw-r--r--.distfiles2
-rw-r--r--.editorconfig9
-rw-r--r--ChangeLog5
3 files changed, 14 insertions, 2 deletions
diff --git a/.distfiles b/.distfiles
index 8e0d2f359..57262947c 100644
--- a/.distfiles
+++ b/.distfiles
@@ -1,5 +1,5 @@
 DISTFILES_SRC='
-    .cvsignore .distfiles .gitignore .preconfig Makefile.in
+    .cvsignore .distfiles .editorconfig .gitignore .preconfig Makefile.in
     ChangeLog
     FEATURES INSTALL LICENCE MACHINES META-FAQ NEWS README
     aclocal.m4 aczsh.m4 configure.ac
diff --git a/.editorconfig b/.editorconfig
new file mode 100644
index 000000000..58421c055
--- /dev/null
+++ b/.editorconfig
@@ -0,0 +1,9 @@
+root = true  # Top-most editorconfig file
+
+[*]
+end_of_line = lf
+tab_width   = 8
+indent_size = 2
+
+[*.[ch]]
+indent_size = 4
diff --git a/ChangeLog b/ChangeLog
index 24b7a7c40..6b354086c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2012-09-30  Peter Stephenson  <p.w.stephenson@ntlworld.com>
 
+	* Aaron Schrab: 30712: .editorconfig: multi-editor specification
+	of editing formats.
+
 	* Aaron Schrab: 30711: Completion/Unix/Type/_bind_addresses:
 	improved IPv6 completion.
 
@@ -199,5 +202,5 @@
 
 *****************************************************
 * This is used by the shell to define $ZSH_PATCHLEVEL
-* $Revision: 1.5729 $
+* $Revision: 1.5730 $
 *****************************************************