Commit efc26dbe authored by Stefan Monnier's avatar Stefan Monnier
Browse files

* lisp/progmodes/sh-script.el (sh-syntax-propertize-function): Mark "${#VAR"

as not-a-comment.
* test/indent/shell.sh: Add test case for ${#VAR}.

Fixes: debbugs:11946
parent f5695c9a
2012-07-17 Stefan Monnier <monnier@iro.umontreal.ca> 2012-07-17 Stefan Monnier <monnier@iro.umontreal.ca>
   
* progmodes/sh-script.el (sh-syntax-propertize-function): Mark "${#VAR"
as not-a-comment (bug#11946).
* emacs-lisp/macroexp.el (macroexp-let2): Use more informative names * emacs-lisp/macroexp.el (macroexp-let2): Use more informative names
for uninterned vars. for uninterned vars.
   
......
...@@ -285,7 +285,7 @@ Activation is performed with `ad-update', hence remaining advice will get ...@@ -285,7 +285,7 @@ Activation is performed with `ad-update', hence remaining advice will get
activated only if the advice of FUNCTION is currently active. If FUNCTION activated only if the advice of FUNCTION is currently active. If FUNCTION
was not traced this is a noop." was not traced this is a noop."
(interactive (interactive
(list (ad-read-advised-function "Untrace function: " 'trace-is-traced))) (list (ad-read-advised-function "Untrace function" 'trace-is-traced)))
(when (trace-is-traced function) (when (trace-is-traced function)
(ad-remove-advice function 'around trace-advice-name) (ad-remove-advice function 'around trace-advice-name)
(ad-update function))) (ad-update function)))
......
...@@ -1087,7 +1087,7 @@ subshells can nest." ...@@ -1087,7 +1087,7 @@ subshells can nest."
;; metacharacters. The list of special chars is taken from ;; metacharacters. The list of special chars is taken from
;; the single-unix spec of the shell command language (under ;; the single-unix spec of the shell command language (under
;; `quoting') but with `$' removed. ;; `quoting') but with `$' removed.
("[^|&;<>()`\\\"' \t\n]\\(#+\\)" (1 "_")) ("\\(?:[^|&;<>()`\\\"' \t\n]\\|\\${\\)\\(#+\\)" (1 "_"))
;; In a '...' the backslash is not escaping. ;; In a '...' the backslash is not escaping.
("\\(\\\\\\)'" (1 (sh-font-lock-backslash-quote))) ("\\(\\\\\\)'" (1 (sh-font-lock-backslash-quote)))
;; Make sure $@ and $? are correctly recognized as sexps. ;; Make sure $@ and $? are correctly recognized as sexps.
......
2012-07-17 Stefan Monnier <monnier@iro.umontreal.ca> 2012-07-17 Stefan Monnier <monnier@iro.umontreal.ca>
* indent/shell.sh: Add test case for ${#VAR}.
* indent/latex-mode.tex: New file. * indent/latex-mode.tex: New file.
2012-07-11 Stefan Monnier <monnier@iro.umontreal.ca> 2012-07-11 Stefan Monnier <monnier@iro.umontreal.ca>
......
#!/bin/sh #!/bin/sh
# -*- eval: (bug-reference-mode 1) -*-
setlock -n /tmp/getmail.lock && echo getmail isn\'t running setlock -n /tmp/getmail.lock && echo getmail isn\'t running
# adsgsdg # adsgsdg
declare -a VERSION
for i in $(ls "$PREFIX/sbin") ; do
echo -e $N')' $i
VERSION[${#VERSION[*]}]=$i #bug#11946.
N=$(($N + 1))
done
foo () { foo () {
bar () { bar () {
......
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