Commit aa7aaf8f authored by Stefan Monnier's avatar Stefan Monnier
Browse files

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

change.

Fixes: debbugs:11826
parent cb442973
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>
......
......@@ -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))
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment