Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
emacs
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
4
Issues
4
List
Boards
Labels
Service Desk
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Incidents
Environments
Packages & Registries
Packages & Registries
Container Registry
Analytics
Analytics
CI / CD
Repository
Value Stream
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
emacs
emacs
Commits
e9638b49
Commit
e9638b49
authored
Jun 19, 2014
by
Stefan Monnier
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
* lisp/progmodes/sh-script.el (sh-smie-sh-rules): Use same rule for && as
for |. Fixes: debbugs:17621
parent
1503d26a
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
12 additions
and
1 deletion
+12
-1
lisp/ChangeLog
lisp/ChangeLog
+5
-0
lisp/progmodes/sh-script.el
lisp/progmodes/sh-script.el
+1
-1
test/indent/shell.sh
test/indent/shell.sh
+6
-0
No files found.
lisp/ChangeLog
View file @
e9638b49
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).
...
...
lisp/progmodes/sh-script.el
View file @
e9638b49
...
...
@@ -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
))
...
...
test/indent/shell.sh
View file @
e9638b49
...
...
@@ -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
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment