(lisp-font-lock-keywords-2): Recognize the new \(?1:..\)

syntax as well.  Reported by Juri Linkov <juri@jurta.org>.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index a787f7bb3788560039ebfd065e0fa445540991c8..aa5bbc212a18ceb783cb5008c28f546f8c7112e6 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2007-06-29  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+       * font-lock.el (lisp-font-lock-keywords-2): Recognize the new \(?1:..\)
+       syntax as well.  Reported by Juri Linkov <juri@jurta.org>.
+
 2007-06-28  Jan Dj\e,Ad\e(Brv  <jan.h.d@swipnet.se>
 
        * dnd.el (dnd-get-local-file-name): Set fixcase to t in call to

diff --git a/lisp/font-lock.el b/lisp/font-lock.el
index 265cc4bf682e62cfc02689058f3b07c786670dd1..4fd933e3191e9337f92ebfe79510026bd9c17e5a 100644 (file)
--- a/lisp/font-lock.el
+++ b/lisp/font-lock.el
@@ -2287,7 +2287,7 @@ other modes in which C preprocessor directives are used. e.g. `asm-mode' and
             ;; that do not occur in strings.  The associated regexp matches one
             ;; of `\\\\' `\\(' `\\(?:' `\\|' `\\)'.  `\\\\' has been included to
             ;; avoid highlighting, for example, `\\(' in `\\\\('.
-            (while (re-search-forward "\\(\\\\\\\\\\)\\(?:\\(\\\\\\\\\\)\\|\\((\\(?:\\?:\\)?\\|[|)]\\)\\)" bound t)
+            (while (re-search-forward "\\(\\\\\\\\\\)\\(?:\\(\\\\\\\\\\)\\|\\((\\(?:\\?[0-9]*:\\)?\\|[|)]\\)\\)" bound t)
               (unless (match-beginning 2)
                 (let ((face (get-text-property (1- (point)) 'face)))
                   (when (or (and (listp face)