* lisp/progmodes/ruby-mode.el (ruby-smie-rules): Indent ternary if.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index a0651917f3f35a88dd312173b56f2e94ea07ae75..9a424b239c24f24c4623463af3a99e75dcf10464 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,7 @@
+2013-12-17  Dmitry Gutov  <dgutov@yandex.ru>
+
+       * progmodes/ruby-mode.el (ruby-smie-rules): Indent ternary if.
+
 2013-12-17  Stefan Monnier  <monnier@iro.umontreal.ca>
 
        * net/shr.el (shr-insert-document): Remove unused var

diff --git a/lisp/progmodes/ruby-mode.el b/lisp/progmodes/ruby-mode.el
index e5148d29a972fbc6a12879fe313d6beec464fdcc..54eba5b91642252e9133d0b006236f3f5b94f557 100644 (file)
--- a/lisp/progmodes/ruby-mode.el
+++ b/lisp/progmodes/ruby-mode.el
@@ -577,6 +577,7 @@ It is used when `ruby-encoding-magic-comment-style' is set to `custom'."
                      "+=" "-=" "*=" "/=" "%=" "**=" "&=" "|=" "^=" "|"
                      "<<=" ">>=" "&&=" "||=" "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)))

diff --git a/test/indent/ruby.rb b/test/indent/ruby.rb
index 19bc0d03d47d21f30352168b400feb6905f22240..c132b01fd869316b5cb528eaccbf7924f0abc59a 100644 (file)
--- a/test/indent/ruby.rb
+++ b/test/indent/ruby.rb
@@ -330,3 +330,7 @@ end
 
 %^abc^
 ddd
+
+qux = foo ?
+        bar :
+        tee