2 files changed, 8 insertions, 4 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 926bd1091c0..cc302daa9cf 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,9 @@
+2013-10-24  Dmitry Gutov  <dgutov@yandex.ru>
+
+        * progmodes/ruby-mode.el (ruby-smie-rules): Fix the "curly block
+        with parameters" example.  Simplify the "is it block or is it
+        hash" check, but also make it more thorough.
+
 2013-10-23  Masashi Fujimoto  <masfj.dev@gmail.com>  (tiny change)
 
         * battery.el (battery-pmset): Handle OS X Mavericks.  (Bug#15694)
diff --git a/lisp/progmodes/ruby-mode.el b/lisp/progmodes/ruby-mode.el
index 88820a4a942..5f553b94ba7 100644
--- a/lisp/progmodes/ruby-mode.el
+++ b/lisp/progmodes/ruby-mode.el
@@ -449,7 +449,7 @@ explicitly declared in magic comment."
       ((smie-rule-parent-p "def" "begin" "do" "class" "module" "for"
                            "while" "until" "unless"
                            "if" "then" "elsif" "else" "when"
-                           "rescue" "ensure")
+                           "rescue" "ensure" "{")
        (smie-rule-parent ruby-indent-level))
       ;; For (invalid) code between switch and case.
       ;; (if (smie-parent-p "switch") 4)
@@ -457,9 +457,7 @@ explicitly declared in magic comment."
     (`(:before . ,(or `"(" `"[" `"{"))
      (cond
       ((and (equal token "{")
-            (not (smie-rule-prev-p "(" "{" "[" "," "=>"))
-            (or (smie-rule-hanging-p)
-                (smie-rule-next-p "opening-|")))
+            (not (smie-rule-prev-p "(" "{" "[" "," "=>" "=" "return" ";")))
        ;; Curly block opener.
        (smie-rule-parent))
       ((smie-rule-hanging-p)