Mercurial > emacs

changeset 72015:93069e336ae9

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
(sh-quoted-subshell): Fix last change.
author Stefan Monnier <monnier@iro.umontreal.ca>
date Wed, 19 Jul 2006 04:31:41 +0000
parents 0429cbee770a
children 4a678a57f325
files lisp/ChangeLog lisp/progmodes/sh-script.el
diffstat 2 files changed, 5 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/lisp/ChangeLog	Wed Jul 19 02:22:51 2006 +0000
+++ b/lisp/ChangeLog	Wed Jul 19 04:31:41 2006 +0000
@@ -1,3 +1,7 @@
+2006-07-19  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+	* progmodes/sh-script.el (sh-quoted-subshell): Fix last change.
+
 2006-07-18  Stefan Monnier  <monnier@iro.umontreal.ca>
 
 	* progmodes/sh-script.el (sh-font-lock-keywords-1):
--- a/lisp/progmodes/sh-script.el	Wed Jul 19 02:22:51 2006 +0000
+++ b/lisp/progmodes/sh-script.el	Wed Jul 19 04:31:41 2006 +0000
@@ -985,7 +985,7 @@
   ;; 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)