diff options
| author | Stefan Monnier <monnier@iro.umontreal.ca> | 2012-07-17 07:52:00 -0400 |
|---|---|---|
| committer | Stefan Monnier <monnier@iro.umontreal.ca> | 2012-07-17 07:52:00 -0400 |
| commit | 4dc7c8d5795458e89d19b59f64760e155c2cd70b (patch) | |
| tree | 2eb1ef73d69102f0ebee4e39056078adcdd49529 /lisp/progmodes/sh-script.el | |
| parent | 2143fa32671374cdef26fdb24355bf690728a344 (diff) | |
| parent | fbf31a9c2c08c86a7ab490cb7b920245b829a61d (diff) | |
| download | emacs-4dc7c8d5795458e89d19b59f64760e155c2cd70b.tar.gz emacs-4dc7c8d5795458e89d19b59f64760e155c2cd70b.tar.bz2 emacs-4dc7c8d5795458e89d19b59f64760e155c2cd70b.zip | |
Merge from emacs-24
Diffstat (limited to 'lisp/progmodes/sh-script.el')
| -rw-r--r-- | lisp/progmodes/sh-script.el | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/lisp/progmodes/sh-script.el b/lisp/progmodes/sh-script.el index 034cfa4b394..be664c6fc6e 100644 --- a/lisp/progmodes/sh-script.el +++ b/lisp/progmodes/sh-script.el @@ -1096,12 +1096,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)) |