Commit d8899d09 authored by Stefan Monnier's avatar Stefan Monnier

* lisp/progmodes/sh-script.el (sh-smie-sh-rules): Don't align with a && in

the middle of a line.

Fixes: debbugs:17896
parent c8387084
2014-07-08 Stefan Monnier <monnier@iro.umontreal.ca>
* progmodes/sh-script.el (sh-smie-sh-rules): Don't align with a && in
the middle of a line (bug#17896).
2014-07-08 Juri Linkov <juri@jurta.org> 2014-07-08 Juri Linkov <juri@jurta.org>
* startup.el (command-line): Append displaying the warning about * startup.el (command-line): Append displaying the warning about
......
...@@ -1989,9 +1989,10 @@ May return nil if the line should not be treated as continued." ...@@ -1989,9 +1989,10 @@ May return nil if the line should not be treated as continued."
(<= indent initial))))) (<= indent initial)))))
`(column . ,(+ initial sh-indentation))) `(column . ,(+ initial sh-indentation)))
(`(:before . ,(or `"(" `"{" `"[")) (`(:before . ,(or `"(" `"{" `"["))
(when (smie-rule-hanging-p) (if (not (smie-rule-prev-p "&&" "||" "|"))
(if (not (smie-rule-prev-p "&&" "||" "|")) (when (smie-rule-hanging-p)
(smie-rule-parent) (smie-rule-parent))
(unless (smie-rule-bolp)
(smie-backward-sexp 'halfexp) (smie-backward-sexp 'halfexp)
`(column . ,(smie-indent-virtual))))) `(column . ,(smie-indent-virtual)))))
;; FIXME: Maybe this handling of ;; should be made into ;; FIXME: Maybe this handling of ;; should be made into
......
...@@ -41,6 +41,12 @@ for foo in bar; do # bug#17721 ...@@ -41,6 +41,12 @@ for foo in bar; do # bug#17721
} }
done done
for foo in bar; do # bug#17896
[ -e $foo ] && [ -e $bar ] && {
echo just fine thanks
}
done
filter_3 () # bug#17842 filter_3 () # bug#17842
{ {
tr -d '"`' | tr ' ' ' ' | \ tr -d '"`' | tr ' ' ' ' | \
......
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