From: Stefan Monnier Date: Fri, 29 Jun 2007 04:29:43 +0000 (+0000) Subject: (lisp-font-lock-keywords-2): Recognize the new \(?1:..\) X-Git-Tag: emacs-pretest-23.0.90~12073 X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=0ffaebf0120ea3851307d3ed2cee1134b7c852fb;p=emacs.git (lisp-font-lock-keywords-2): Recognize the new \(?1:..\) syntax as well. Reported by Juri Linkov . --- diff --git a/lisp/ChangeLog b/lisp/ChangeLog index a787f7bb378..aa5bbc212a1 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,8 @@ +2007-06-29 Stefan Monnier + + * font-lock.el (lisp-font-lock-keywords-2): Recognize the new \(?1:..\) + syntax as well. Reported by Juri Linkov . + 2007-06-28 Jan Dj,Ad(Brv * 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 265cc4bf682..4fd933e3191 100644 --- 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)