* lisp/progmodes/sh-script.el (sh-syntax-propertize-function): Fix last

change.

Fixes: debbugs:11826

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index e5f4bb8f770fa0f8fbb7d6114ab081be0f48f062..1faebf5b0830319f9a7491db6e0be48a2ee3799c 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2012-07-09  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+       * progmodes/sh-script.el (sh-syntax-propertize-function): Fix last
+       change (bug#11826).
+
 2012-07-02  Glenn Morris  <rgm@gnu.org>
 
        * simple.el (kill-whole-line): Doc tweak.
@@ -11,8 +16,8 @@
 
 2012-06-28  Andreas Schwab  <schwab@linux-m68k.org>
 
-       * calendar/cal-dst.el (calendar-current-time-zone): Return
-       calendar-current-time-zone-cache if non-nil.
+       * calendar/cal-dst.el (calendar-current-time-zone):
+       Return calendar-current-time-zone-cache if non-nil.
 
 2012-06-25  Masatake YAMATO  <yamato@redhat.com>
 

diff --git a/lisp/progmodes/sh-script.el b/lisp/progmodes/sh-script.el
index 48b19524b8cc809a9e7a14c7329f33bbdc156252..7d38df6aff6445b8e78675e334ad19871d8ebfd5 100644 (file)
--- a/lisp/progmodes/sh-script.el
+++ b/lisp/progmodes/sh-script.el
@@ -1105,12 +1105,12 @@ subshells can nest."
     (")" (0 (sh-font-lock-paren (match-beginning 0))))
     ;; Highlight (possibly nested) subshells inside "" quoted
     ;; regions correctly.
-    ("\"\\(?:\\(?:[^\\\"]\\|\\)*?[^\\]\\(?:\\\\\\\\\\)*\\)??\\(\\$(\\|`\\)"
+    ("\"\\(?:\\(?:[^\\\"]\\|\\\\.\\)*?\\)??\\(\\$(\\|`\\)"
      (1 (ignore
-         ;; Save excursion because we want to also apply other
-         ;; syntax-propertize rules within the affected region.
-         (if (nth 8 (syntax-ppss))
+         (if (nth 8 (save-excursion (syntax-ppss (match-beginning 0))))
              (goto-char (1+ (match-beginning 0)))
+           ;; Save excursion because we want to also apply other
+           ;; syntax-propertize rules within the affected region.
            (save-excursion
              (sh-font-lock-quoted-subshell end)))))))
    (point) end))