# HG changeset patch
# User Stefan Monnier <monnier@iro.umontreal.ca>
# Date 1235081896 0
# Node ID 69c0814ddb4e5ddb66021f0f4051d7a65274279a
# Parent  057f3865081070a1c9ca7534b6f0d535c862a46b
(sh-font-lock-quoted-subshell): ' inside a "..." does not quote anything.

diff -r 057f38650810 -r 69c0814ddb4e lisp/ChangeLog
--- a/lisp/ChangeLog	Thu Feb 19 22:14:12 2009 +0000
+++ b/lisp/ChangeLog	Thu Feb 19 22:18:16 2009 +0000
@@ -1,5 +1,8 @@
 2009-02-19  Stefan Monnier  <monnier@iro.umontreal.ca>
 
+	* progmodes/sh-script.el (sh-font-lock-quoted-subshell): ' inside
+	a "..." does not quote anything.
+
 	* textmodes/rst.el (rst-mode-abbrev-table): Mark entries as `system'.
 
 2009-02-19  Andreas Schwab  <schwab@suse.de>
diff -r 057f38650810 -r 69c0814ddb4e lisp/progmodes/sh-script.el
--- a/lisp/progmodes/sh-script.el	Thu Feb 19 22:14:12 2009 +0000
+++ b/lisp/progmodes/sh-script.el	Thu Feb 19 22:18:16 2009 +0000
@@ -1063,7 +1063,9 @@
                                (< (point) limit)))
         ;; unescape " inside a $( ... ) construct.
         (case (char-after)
-          (?\' (forward-char 1) (skip-chars-forward "^'" limit))
+          (?\' (case state
+                 (double-quote nil)
+                 (t (forward-char 1) (skip-chars-forward "^'" limit))))
           (?\\ (forward-char 1))
           (?\" (case state
                  (double-quote (setq state (pop states)))