[Emacs-diffs] trunk r115563: * lisp/progmodes/ruby-mode.el (ruby-smie-rules): Indent ternary if.

[Dmitry Gutov]

------------------------------------------------------------
revno: 115563
revision-id: address@hidden
parent: address@hidden
committer: Dmitry Gutov <address@hidden>
branch nick: trunk
timestamp: Tue 2013-12-17 14:04:23 +0200
message:
  * lisp/progmodes/ruby-mode.el (ruby-smie-rules): Indent ternary if.
modified:
  lisp/ChangeLog                 changelog-20091113204419-o5vbwnq5f7feedwu-1432
  lisp/progmodes/ruby-mode.el    
rubymode.el-20091113204419-o5vbwnq5f7feedwu-8804
  test/indent/ruby.rb            ruby.rb-20120424165921-h044139hbrd7snvw-1

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2013-12-17 02:48:06 +0000
+++ b/lisp/ChangeLog    2013-12-17 12:04:23 +0000
@@ -1,3 +1,7 @@
+2013-12-17  Dmitry Gutov  <address@hidden>
+
+       * progmodes/ruby-mode.el (ruby-smie-rules): Indent ternary if.
+
 2013-12-17  Stefan Monnier  <address@hidden>
 
        * net/shr.el (shr-insert-document): Remove unused var

=== modified file 'lisp/progmodes/ruby-mode.el'
--- a/lisp/progmodes/ruby-mode.el       2013-12-14 13:57:58 +0000
+++ b/lisp/progmodes/ruby-mode.el       2013-12-17 12:04:23 +0000
@@ -577,6 +577,7 @@
                      "+=" "-=" "*=" "/=" "%=" "**=" "&=" "|=" "^=" "|"
                      "<<=" ">>=" "&&=" "||=" "and" "or"))
      (if (smie-rule-parent-p ";" nil) ruby-indent-level))
+    (`(:after . ,(or "?" ":")) ruby-indent-level)
     (`(:before . "begin")
      (unless (save-excursion (skip-chars-backward " \t") (bolp))
        (smie-rule-parent)))

=== modified file 'test/indent/ruby.rb'
--- a/test/indent/ruby.rb       2013-12-17 01:31:55 +0000
+++ b/test/indent/ruby.rb       2013-12-17 12:04:23 +0000
@@ -330,3 +330,7 @@
 
 %^abc^
 ddd
+
+qux = foo ?
+        bar :
+        tee