diff options
| author | Peter Stephenson <pws@users.sourceforge.net> | 2012-09-30 16:18:42 +0000 |
|---|---|---|
| committer | Peter Stephenson <pws@users.sourceforge.net> | 2012-09-30 16:18:42 +0000 |
| commit | 2cd0f0c55561160a7b7903512a7c264959f37663 (patch) | |
| tree | a9b4b707c129977e0eb14f77c596a82fbdbd0c93 | |
| parent | 71631df1e7e68582b29d80e149fd46a57e3874eb (diff) | |
| download | zsh-2cd0f0c55561160a7b7903512a7c264959f37663.tar.gz zsh-2cd0f0c55561160a7b7903512a7c264959f37663.tar.xz zsh-2cd0f0c55561160a7b7903512a7c264959f37663.zip | |
Aaron Schrab: 30712: .editorconfig: multi-editor specification of
editing formats.
| -rw-r--r-- | .distfiles | 2 | ||||
| -rw-r--r-- | .editorconfig | 9 | ||||
| -rw-r--r-- | ChangeLog | 5 |
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 $ ***************************************************** |