aboutsummaryrefslogtreecommitdiffstats
path: root/ChangeLog
diff options
context:
space:
mode:
authornobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2012-12-03 03:43:40 +0000
committernobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2012-12-03 03:43:40 +0000
commit983c2e874f2c5e12fa29d3c66d077aa232092834 (patch)
tree5b547a88a4b0dc33ea2d1152efc5b26e84cf7f91 /ChangeLog
parent488fb86a1eb3307030c8d4c0946ea080205b78f3 (diff)
downloadruby-983c2e874f2c5e12fa29d3c66d077aa232092834.tar.gz
ruby-mode.el: fix argument indent
* misc/ruby-mode.el (ruby-block-end-re, ruby-delimiter) (ruby-mode-syntax-table, ruby-parse-partial, ruby-beginning-of-indent): merge from Emacs. * misc/ruby-mode.el (ruby-calculate-indent): fix indentation of argument lines in parentheses. [Bug #5140] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@38150 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'ChangeLog')
-rw-r--r--ChangeLog9
1 files changed, 9 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index e3d5482916..5b1ae043ce 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+Mon Dec 3 12:43:35 2012 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * misc/ruby-mode.el (ruby-block-end-re, ruby-delimiter)
+ (ruby-mode-syntax-table, ruby-parse-partial, ruby-beginning-of-indent):
+ merge from Emacs.
+
+ * misc/ruby-mode.el (ruby-calculate-indent): fix indentation of
+ argument lines in parentheses. [Bug #5140]
+
Mon Dec 3 07:52:41 2012 Eric Hodel <drbrain@segment7.net>
* lib/rdoc/parser.rb: Improved modeline support. Patch by nobu.