aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog6
-rw-r--r--misc/ruby-electric.el7
2 files changed, 11 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index a7182db1b3..f2121fe438 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Fri Dec 28 17:06:17 2012 Akinori MUSHA <knu@iDaemons.org>
+
+ * misc/ruby-electric.el (ruby-electric-curlies): Automatically
+ indent closing curly brackets when
+ ruby-electric-newline-before-closing-bracket is true.
+
Fri Dec 28 11:50:42 2012 Nobuyoshi Nakada <nobu@ruby-lang.org>
* vm_insnhelper.c (vm_yield_setup_block_args): pass single argument to
diff --git a/misc/ruby-electric.el b/misc/ruby-electric.el
index 0a55681a6e..bbdfbb7c60 100644
--- a/misc/ruby-electric.el
+++ b/misc/ruby-electric.el
@@ -168,8 +168,11 @@ strings. Note that you must have Font Lock enabled."
(insert " ")
(save-excursion
(if ruby-electric-newline-before-closing-bracket
- (newline))
- (insert "}")))
+ (progn
+ (newline)
+ (insert "}")
+ (ruby-indent-line t))
+ (insert "}"))))
((ruby-electric-string-at-point-p)
(if (eq last-command-event ?{)
(save-excursion