diff --git a/.editorconfig b/.editorconfig new file mode 100644 index 0000000000..67abf4b978 --- /dev/null +++ b/.editorconfig @@ -0,0 +1,16 @@ +root = true + +[*] +end_of_line = lf +insert_final_newline = true +trim_trailing_whitespace = true +tab_width = 8 +indent_style = tab +indent_size = 4 + +[**.bat] +end_of_line = crlf + +[**.rb] +indent_style = space +indent_size = 2 diff --git a/ChangeLog b/ChangeLog index bef6f39091..eef9b690b7 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +Sun Sep 16 08:16:05 2012 Nobuyoshi Nakada + + * .editorconfig: add. [ruby-core:47548] [Feature #7030] + Sat Sep 15 01:56:40 2012 NARUSE, Yui * ext/nkf/nkf-utf8/nkf.c: Merge upstream: 50a383c84.