From: Glenn Morris <rgm@gnu.org>
Date: Thu, 17 Nov 2011 02:38:54 +0000 (-0500)
Subject: Small fix for sh-font-lock-keywords-var bash entry.
X-Git-Tag: emacs-pretest-24.0.92~161
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=35c0bac81abf468534817d0e56b5b3f695fd71f9;p=emacs.git

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.
---

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index bfa5a940a76..ccb115ec471 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2011-11-17  Glenn Morris  <rgm@gnu.org>
+
+	* progmodes/sh-script.el (sh-font-lock-keywords-var):
+	Make bash entry derive from sh entry, not shell entry.
+
 2011-11-16  Michael Albinus  <michael.albinus@gmx.de>
 
 	* 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 7b949134c6c..da2b4e81577 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