* lisp/progmodes/ruby-mode.el (ruby-smie-rules): Indent middle-of-block

keywords to their parent.

3 files changed, 12 insertions, 2 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 09d4cebb6f5..5fd4ff56c66 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,10 @@
 2013-12-19  Dmitry Gutov  <dgutov@yandex.ru>
 
+        * progmodes/ruby-mode.el (ruby-smie-rules): Indent middle-of-block
+        keywords to their parent.
+
+2013-12-19  Dmitry Gutov  <dgutov@yandex.ru>
+
         * progmodes/ruby-mode.el (ruby-smie--args-separator-p): Allow the
         first arg to be a string (fixed dead code), or an operator symbol.
         (ruby-smie--forward-token): Tokenize ` @ ' before strings and
diff --git a/lisp/progmodes/ruby-mode.el b/lisp/progmodes/ruby-mode.el
index e291acec327..449a10dc999 100644
--- a/lisp/progmodes/ruby-mode.el
+++ b/lisp/progmodes/ruby-mode.el
@@ -569,8 +569,9 @@ It is used when `ruby-encoding-magic-comment-style' is set to `custom'."
          (cons 'column (current-column)))))
     (`(:before . "do") (ruby-smie--indent-to-stmt))
     (`(:before . ".") ruby-indent-level)
-    (`(:before . ,(or `"else" `"then" `"elsif" `"rescue" `"ensure")) 0)
-    (`(:before . ,(or `"when"))
+    (`(:before . ,(or `"else" `"then" `"elsif" `"rescue" `"ensure"))
+     (smie-rule-parent))
+    (`(:before . "when")
      (if (not (smie-rule-sibling-p)) 0)) ;; ruby-indent-level
     (`(:after . ,(or "=" "iuwu-mod" "+" "-" "*" "/" "&&" "||" "%" "**" "^" "&"
                      "<=>" ">" "<" ">=" "<=" "==" "===" "!=" "<<" ">>"
diff --git a/test/indent/ruby.rb b/test/indent/ruby.rb
index 0bf4bc14fbb..1993c29efb3 100644
--- a/test/indent/ruby.rb
+++ b/test/indent/ruby.rb
@@ -272,6 +272,8 @@ end
 # http://stackoverflow.com/questions/17786563/emacs-ruby-mode-if-expressions-indentation
 tee = if foo
         bar
+      else
+        tee
       end
 
 a = b {
@@ -328,6 +330,8 @@ def qux
   foo ||= begin
     bar
     tee
+  rescue
+    oomph
   end
 end