summaryrefslogtreecommitdiff
path: root/lisp/progmodes
diff options
context:
space:
mode:
authorDmitry Gutov <dgutov@yandex.ru>2013-12-17 14:04:23 +0200
committerDmitry Gutov <dgutov@yandex.ru>2013-12-17 14:04:23 +0200
commit35b249a653c0f855d6d0d421be216e6465585ce4 (patch)
treeff1c7c69f4a8606960f39c65aac3d2edbca964d5 /lisp/progmodes
parentcb8b0736d56871ed988a6f7f2071e0bdd9f760bb (diff)
downloademacs-35b249a653c0f855d6d0d421be216e6465585ce4.tar.gz
* lisp/progmodes/ruby-mode.el (ruby-smie-rules): Indent ternary if.
Diffstat (limited to 'lisp/progmodes')
-rw-r--r--lisp/progmodes/ruby-mode.el1
1 files changed, 1 insertions, 0 deletions
diff --git a/lisp/progmodes/ruby-mode.el b/lisp/progmodes/ruby-mode.el
index e5148d29a97..54eba5b9164 100644
--- 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)))