diff options
| -rw-r--r-- | lisp/ChangeLog | 5 | ||||
| -rw-r--r-- | lisp/font-lock.el | 2 |
2 files changed, 6 insertions, 1 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index a787f7bb378..aa5bbc212a1 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog | |||
| @@ -1,3 +1,8 @@ | |||
| 1 | 2007-06-29 Stefan Monnier <monnier@iro.umontreal.ca> | ||
| 2 | |||
| 3 | * font-lock.el (lisp-font-lock-keywords-2): Recognize the new \(?1:..\) | ||
| 4 | syntax as well. Reported by Juri Linkov <juri@jurta.org>. | ||
| 5 | |||
| 1 | 2007-06-28 Jan Dj,Ad(Brv <jan.h.d@swipnet.se> | 6 | 2007-06-28 Jan Dj,Ad(Brv <jan.h.d@swipnet.se> |
| 2 | 7 | ||
| 3 | * dnd.el (dnd-get-local-file-name): Set fixcase to t in call to | 8 | * 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 | |||
| 2287 | ;; that do not occur in strings. The associated regexp matches one | 2287 | ;; that do not occur in strings. The associated regexp matches one |
| 2288 | ;; of `\\\\' `\\(' `\\(?:' `\\|' `\\)'. `\\\\' has been included to | 2288 | ;; of `\\\\' `\\(' `\\(?:' `\\|' `\\)'. `\\\\' has been included to |
| 2289 | ;; avoid highlighting, for example, `\\(' in `\\\\('. | 2289 | ;; avoid highlighting, for example, `\\(' in `\\\\('. |
| 2290 | (while (re-search-forward "\\(\\\\\\\\\\)\\(?:\\(\\\\\\\\\\)\\|\\((\\(?:\\?:\\)?\\|[|)]\\)\\)" bound t) | 2290 | (while (re-search-forward "\\(\\\\\\\\\\)\\(?:\\(\\\\\\\\\\)\\|\\((\\(?:\\?[0-9]*:\\)?\\|[|)]\\)\\)" bound t) |
| 2291 | (unless (match-beginning 2) | 2291 | (unless (match-beginning 2) |
| 2292 | (let ((face (get-text-property (1- (point)) 'face))) | 2292 | (let ((face (get-text-property (1- (point)) 'face))) |
| 2293 | (when (or (and (listp face) | 2293 | (when (or (and (listp face) |