Commit e9638b49 authored by Stefan Monnier's avatar Stefan Monnier

* lisp/progmodes/sh-script.el (sh-smie-sh-rules): Use same rule for && as

for |.

Fixes: debbugs:17621
parent 1503d26a
2014-06-19 Stefan Monnier <monnier@iro.umontreal.ca>
* progmodes/sh-script.el (sh-smie-sh-rules): Use same rule for && as
for | (bug#17621).
2014-06-18 Stefan Monnier <monnier@iro.umontreal.ca>
* xt-mouse.el (xterm-mouse-translate-1): Fix last change (bug#17776).
......
......@@ -1970,7 +1970,7 @@ May return nil if the line should not be treated as continued."
(smie-rule-bolp))))
(current-column)
(smie-indent-calculate)))))
(`(:after . "|") (if (smie-rule-parent-p "|") nil 4))
(`(:after . ,(or `"|" `"&&" `"||")) (if (smie-rule-parent-p token) nil 4))
;; Attempt at backward compatibility with the old config variables.
(`(:before . "fi") (sh-var-value 'sh-indent-for-fi))
(`(:before . "done") (sh-var-value 'sh-indent-for-done))
......
......@@ -23,6 +23,12 @@ case $X in
;;
esac
{ # bug#17621
foo1 &&
foo2 &&
bar
}
echo -n $(( 5 << 2 ))
# This should not be treated as a heredoc (bug#12770).
2
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment