aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authornobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2011-03-08 14:10:19 +0000
committernobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2011-03-08 14:10:19 +0000
commit6b0dc7fd81b25bc66681548b8b82f38258f7e08c (patch)
treec14b29ff4af7cd4c73c2ed4f4d5aadf1873011de
parenta190741da4681820d38d977bf2f14f969f9ffca3 (diff)
downloadruby-6b0dc7fd81b25bc66681548b8b82f38258f7e08c.tar.gz
* misc/ruby-mode.el (ruby-parse-partial): fix for array in block.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@31065 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog4
-rw-r--r--misc/ruby-mode.el3
2 files changed, 6 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 1985ce6361..e3b2af32d1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Tue Mar 8 23:10:16 2011 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * misc/ruby-mode.el (ruby-parse-partial): fix for array in block.
+
Tue Mar 8 21:44:49 2011 Tanaka Akira <akr@fsij.org>
* ext/openssl/ossl_rand.c: parenthesize macro arguments.
diff --git a/misc/ruby-mode.el b/misc/ruby-mode.el
index c86c65c3e7..1b16c68366 100644
--- a/misc/ruby-mode.el
+++ b/misc/ruby-mode.el
@@ -601,7 +601,8 @@ The variable ruby-indent-level controls the amount of indentation.
(goto-char pnt)
)
((looking-at "[])}]")
- (if (ruby-deep-indent-paren-p (matching-paren (char-after)))
+ (if (ruby-deep-indent-paren-p (matching-paren (char-after))
+ (save-excursion (ruby-backward-sexp) (point)))
(setq depth (cdr (car pcol)) pcol (cdr pcol))
(setq depth (1- depth)))
(setq nest (cdr nest))