(sh-quoted-subshell): Fix last change.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 079e012d15f8248e3f999587f55b3841456227d9..074c226ce4c71f1260ed51a85e715a6a191ab9f3 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -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):

diff --git a/lisp/progmodes/sh-script.el b/lisp/progmodes/sh-script.el
index d69229780b6bf87d0f6a275dbb9cefdc0eb6511c..6e933d087e23636c6879064d901d2889033e407b 100644 (file)
--- 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)