aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGlenn Morris <[email protected]>2011-11-16 21:38:54 -0500
committerGlenn Morris <[email protected]>2011-11-16 21:38:54 -0500
commit35c0bac81abf468534817d0e56b5b3f695fd71f9 (patch)
tree34f37593b83314c7d992d7f68f24b29e9cbe64af
parentd0c8fc8abb5891d11b17a0b97f6fce0b066bb6cc (diff)
Small fix for sh-font-lock-keywords-var bash entry.
* lisp/progmodes/sh-script.el (sh-font-lock-keywords-var): Make bash entry derive from sh entry, not shell entry.
-rw-r--r--lisp/ChangeLog5
-rw-r--r--lisp/progmodes/sh-script.el2
2 files changed, 6 insertions, 1 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index bfa5a940a7..ccb115ec47 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2011-11-17 Glenn Morris <[email protected]>
+
+ * progmodes/sh-script.el (sh-font-lock-keywords-var):
+ Make bash entry derive from sh entry, not shell entry.
+
2011-11-16 Michael Albinus <[email protected]>
* net/tramp.el (tramp-handle-file-truename): Cache only the local
diff --git a/lisp/progmodes/sh-script.el b/lisp/progmodes/sh-script.el
index 7b949134c6..da2b4e8157 100644
--- a/lisp/progmodes/sh-script.el
+++ b/lisp/progmodes/sh-script.el
@@ -889,7 +889,7 @@ See `sh-feature'.")
font-lock-variable-name-face))
(rc sh-append es)
- (bash sh-append shell ("\\$(\\(\\sw+\\)" (1 'sh-quoted-exec t) ))
+ (bash sh-append sh ("\\$(\\(\\sw+\\)" (1 'sh-quoted-exec t) ))
(sh sh-append shell
;; Variable names.
("\\$\\({#?\\)?\\([[:alpha:]_][[:alnum:]_]*\\|[-#?@!]\\)" 2