[Emacs-diffs] /srv/bzr/emacs/emacs-24 r108066: * lisp/progmodes/sh-script.el (sh-syntax-propertize-function): Fix last

[Stefan Monnier]

------------------------------------------------------------
revno: 108066
fixes bug: http://debbugs.gnu.org/cgi/bugreport.cgi?bug=11826
committer: Stefan Monnier <address@hidden>
branch nick: emacs-24
timestamp: Mon 2012-07-09 09:54:50 -0400
message:
  * lisp/progmodes/sh-script.el (sh-syntax-propertize-function): Fix last
  change.
modified:
  lisp/ChangeLog
  lisp/progmodes/sh-script.el

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2012-07-02 22:42:45 +0000
+++ b/lisp/ChangeLog    2012-07-09 13:54:50 +0000
@@ -1,3 +1,8 @@
+2012-07-09  Stefan Monnier  <address@hidden>
+
+       * progmodes/sh-script.el (sh-syntax-propertize-function): Fix last
+       change (bug#11826).
+
 2012-07-02  Glenn Morris  <address@hidden>
 
        * simple.el (kill-whole-line): Doc tweak.
@@ -11,8 +16,8 @@
 
 2012-06-28  Andreas Schwab  <address@hidden>
 
-       * 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  <address@hidden>
 

=== modified file 'lisp/progmodes/sh-script.el'
--- a/lisp/progmodes/sh-script.el       2012-01-19 07:21:25 +0000
+++ b/lisp/progmodes/sh-script.el       2012-07-09 13:54:50 +0000
@@ -1105,12 +1105,12 @@
     (")" (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))