From: Stefan Monnier Date: Wed, 19 Jul 2006 04:31:41 +0000 (+0000) Subject: (sh-quoted-subshell): Fix last change. X-Git-Tag: emacs-pretest-22.0.90~1336 X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=a97a33cb2aa15bccf4a00e81853af56e89c96f0a;p=emacs.git (sh-quoted-subshell): Fix last change. --- diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 079e012d15f..074c226ce4c 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,7 @@ +2006-07-19 Stefan Monnier + + * progmodes/sh-script.el (sh-quoted-subshell): Fix last change. + 2006-07-18 Stefan Monnier * progmodes/sh-script.el (sh-font-lock-keywords-1): diff --git a/lisp/progmodes/sh-script.el b/lisp/progmodes/sh-script.el index d69229780b6..6e933d087e2 100644 --- a/lisp/progmodes/sh-script.el +++ b/lisp/progmodes/sh-script.el @@ -985,7 +985,7 @@ Point is at the beginning of the next line." ;; FIXME: This can (and often does) match multiple lines, yet it makes no ;; effort to handle multiline cases correctly, so it ends up being ;; rather flakey. - (if (re-search-forward "\"\\(?:\\(?:.\\|\n\\)*?[^\\]\\(\\\\\\\\\\)*\\)?\\(\\$(\\|`\\)" limit t) + (if (re-search-forward "\"\\(?:\\(?:.\\|\n\\)*?[^\\]\\(\\\\\\\\\\)*\\)??\\(\\$(\\|`\\)" limit t) ;; bingo we have a $( or a ` inside a "" (let ((char (char-after (point))) (continue t)