Merge from emacs-24; up to 2012-12-03T21:07:47Z!eggert@cs.ucla.edu

2 files changed, 18 insertions, 0 deletions

diff --git a/test/ChangeLog b/test/ChangeLog
index e7e7c755d02..7d9b10ce787 100644
--- a/test/ChangeLog
+++ b/test/ChangeLog
@@ -1,3 +1,8 @@
+2012-12-27  Dmitry Gutov  <dgutov@yandex.ru>
+
+        * automated/ruby-mode-tests.el
+        (ruby-indent-after-block-in-continued-expression): New test.
+
 2012-12-14  Dmitry Gutov  <dgutov@yandex.ru>
 
         * automated/ruby-mode-tests.el
diff --git a/test/automated/ruby-mode-tests.el b/test/automated/ruby-mode-tests.el
index 1f0c0ab6f9e..51c28e667fd 100644
--- a/test/automated/ruby-mode-tests.el
+++ b/test/automated/ruby-mode-tests.el
@@ -224,6 +224,19 @@ VALUES-PLIST is a list with alternating index and value elements."
    |  end
    |"))
 
+(ert-deftest ruby-indent-after-block-in-continued-expression ()
+  (ruby-should-indent-buffer
+   "var =
+   |  begin
+   |    val
+   |  end
+   |statement"
+   "var =
+   |begin
+   |val
+   |end
+   |statement"))
+
 (ert-deftest ruby-move-to-block-stops-at-indentation ()
   (ruby-with-temp-buffer "def f\nend"
     (beginning-of-line)