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

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index a3d7cac5d45caa1498566aeeebeb47b2419e8423..cd977569914372cd2955c7b5e5730db3f2716616 100644 (file)
--- 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 847dd4f3fab80bcdbd456289ba8d9f184d6aa36f..c5ca9bbd9c8aabd66f4d0333072961eb1aa915a0 100644 (file)
--- 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)))