(sh-font-lock-quoted-subshell): ' inside a "..." does not quote anything.

2 files changed, 6 insertions, 1 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index a3d7cac5d45..cd977569914 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -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 --git a/lisp/progmodes/sh-script.el b/lisp/progmodes/sh-script.el
index 847dd4f3fab..c5ca9bbd9c8 100644
--- a/lisp/progmodes/sh-script.el
+++ b/lisp/progmodes/sh-script.el
@@ -1063,7 +1063,9 @@ subshells can nest."
                                (< (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)))