Mercurial > emacs
comparison lisp/font-lock.el @ 90789:c0409ee15cee
Merge from emacs--devo--0
Patches applied:
* emacs--devo--0 (patch 670-674)
- Update from CVS
- Merge from gnus--rel--5.10
* gnus--rel--5.10 (patch 209-210)
- Merge from emacs--devo--0
- Update from CVS
Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-185
author | Miles Bader <miles@gnu.org> |
---|---|
date | Wed, 21 Mar 2007 13:33:07 +0000 |
parents | dd7c098af727 f117baed9372 |
children | 4ef881a120fe |
comparison
equal
deleted
inserted
replaced
90788:a12805fdabe8 | 90789:c0409ee15cee |
---|---|
2189 (,(concat "(\\(def\\(" | 2189 (,(concat "(\\(def\\(" |
2190 ;; Function declarations. | 2190 ;; Function declarations. |
2191 "\\(advice\\|alias\\|generic\\|macro\\*?\\|method\\|" | 2191 "\\(advice\\|alias\\|generic\\|macro\\*?\\|method\\|" |
2192 "setf\\|subst\\*?\\|un\\*?\\|" | 2192 "setf\\|subst\\*?\\|un\\*?\\|" |
2193 "ine-\\(condition\\|" | 2193 "ine-\\(condition\\|" |
2194 "\\(?:derived\\|\\(?:global-\\)?minor\\|generic\\)-mode\\|" | 2194 "\\(?:derived\\|\\(?:global\\(?:ized\\)?-\\)?minor\\|generic\\)-mode\\|" |
2195 "method-combination\\|setf-expander\\|skeleton\\|widget\\|" | 2195 "method-combination\\|setf-expander\\|skeleton\\|widget\\|" |
2196 "function\\|\\(compiler\\|modify\\|symbol\\)-macro\\)\\)\\|" | 2196 "function\\|\\(compiler\\|modify\\|symbol\\)-macro\\)\\)\\|" |
2197 ;; Variable declarations. | 2197 ;; Variable declarations. |
2198 "\\(const\\(ant\\)?\\|custom\\|varalias\\|face\\|parameter\\|var\\)\\|" | 2198 "\\(const\\(ant\\)?\\|custom\\|varalias\\|face\\|parameter\\|var\\)\\|" |
2199 ;; Structure declarations. | 2199 ;; Structure declarations. |