[Emacs-diffs] trunk r114536: * lisp/progmodes/ruby-mode.el (ruby-smie-rules): Dedent `ensure'

[Dmitry Gutov]

------------------------------------------------------------
revno: 114536
revision-id: address@hidden
parent: address@hidden
committer: Dmitry Gutov <address@hidden>
branch nick: trunk
timestamp: Sun 2013-10-06 03:46:28 +0300
message:
  * lisp/progmodes/ruby-mode.el (ruby-smie-rules): Dedent `ensure'
  keyword, too.
  
  * test/indent/ruby.rb: Fix a syntax error, add a few failing examples.
modified:
  lisp/ChangeLog                 changelog-20091113204419-o5vbwnq5f7feedwu-1432
  lisp/progmodes/ruby-mode.el    
rubymode.el-20091113204419-o5vbwnq5f7feedwu-8804
  test/ChangeLog                 changelog-20091113204419-o5vbwnq5f7feedwu-8588
  test/indent/ruby.rb            ruby.rb-20120424165921-h044139hbrd7snvw-1

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2013-10-05 23:40:16 +0000
+++ b/lisp/ChangeLog    2013-10-06 00:46:28 +0000
@@ -1,3 +1,8 @@
+2013-10-06  Dmitry Gutov  <address@hidden>
+
+       * progmodes/ruby-mode.el (ruby-smie-rules): Dedent `ensure'
+       keyword, too.
+
 2013-10-05  Dmitry Gutov  <address@hidden>
 
        * newcomment.el (comment-use-global-state): Change default value

=== modified file 'lisp/progmodes/ruby-mode.el'
--- a/lisp/progmodes/ruby-mode.el       2013-10-05 18:37:08 +0000
+++ b/lisp/progmodes/ruby-mode.el       2013-10-06 00:46:28 +0000
@@ -381,7 +381,7 @@
                                     (looking-at comment-start-skip)))))
        ;; `(column . ,(smie-indent-virtual))
        (smie-rule-parent)))
-    (`(:before . ,(or `"else" `"then" `"elsif" `"rescue")) 0)
+    (`(:before . ,(or `"else" `"then" `"elsif" `"rescue" `"ensure")) 0)
     (`(:before . ,(or `"when"))
      (if (not (smie-rule-sibling-p)) 0)) ;; ruby-indent-level
     ;; Hack attack: Since newlines are separators, don't try to align args that

=== modified file 'test/ChangeLog'
--- a/test/ChangeLog    2013-10-05 18:37:08 +0000
+++ b/test/ChangeLog    2013-10-06 00:46:28 +0000
@@ -1,3 +1,7 @@
+2013-10-06  Dmitry Gutov  <address@hidden>
+
+       * indent/ruby.rb: Fix a syntax error, add a few failing examples.
+
 2013-10-05  Stefan Monnier  <address@hidden>
 
        * indent/ruby.rb: Port a few cases from automated/ruby-mode-tests.el.

=== modified file 'test/indent/ruby.rb'
--- a/test/indent/ruby.rb       2013-10-05 18:37:08 +0000
+++ b/test/indent/ruby.rb       2013-10-06 00:46:28 +0000
@@ -37,7 +37,7 @@
        2]
 
 foo = {                         # ruby-deep-indent-disabled
-  a : b
+  a: b
 }
 
 foo = [                         # ruby-deep-indent-disabled
@@ -99,6 +99,27 @@
   do_something
 end
 
+begin
+  foo
+ensure
+  bar
+end
+
+# Examples below fail with SMIE.
+
 # Bug#15369
 MSG = 'Separate every 3 digits in the integer portion of a number' \
       'with underscores(_).'
+
+# Next two fail similarly to the one above, so maybe remove 1 or 2
+# after they're fixed:
+
+a = foo(j, k) -
+  bar_tee
+
+while a < b do # "do" is optional
+  foo
+end
+
+desc "foo foo" \
+  "bar bar"