summaryrefslogtreecommitdiff
path: root/lisp/emacs-lisp
diff options
context:
space:
mode:
authorStefan Monnier <monnier@iro.umontreal.ca>2012-07-17 04:38:12 -0400
committerStefan Monnier <monnier@iro.umontreal.ca>2012-07-17 04:38:12 -0400
commitefc26dbecd1b548d6f44267ce13b56dbad8ab783 (patch)
tree856fe3b0b08897bccacdaab5b1a0f30e7177c1a1 /lisp/emacs-lisp
parentf5695c9afd17315a5f771091044ffc19ad8b7b2b (diff)
downloademacs-efc26dbecd1b548d6f44267ce13b56dbad8ab783.tar.gz
emacs-efc26dbecd1b548d6f44267ce13b56dbad8ab783.tar.bz2
emacs-efc26dbecd1b548d6f44267ce13b56dbad8ab783.zip
* 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
Diffstat (limited to 'lisp/emacs-lisp')
-rw-r--r--lisp/emacs-lisp/trace.el2
1 files changed, 1 insertions, 1 deletions
diff --git a/lisp/emacs-lisp/trace.el b/lisp/emacs-lisp/trace.el
index fd66c9364f2..c6fff7aa443 100644
--- a/lisp/emacs-lisp/trace.el
+++ b/lisp/emacs-lisp/trace.el
@@ -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
was not traced this is a noop."
(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)
(ad-remove-advice function 'around trace-advice-name)
(ad-update function)))