mirror/emacs
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/emacs.git synced 2025-01-03 11:33:37 +00:00
Code Issues Releases Activity

(lisp-font-lock-keywords-1): Minor rearrangement.

Browse Source
This commit is contained in:
Richard M. Stallman 2006-01-17 14:32:16 +00:00
parent 2e040f4ea1
commit 588fe8bc0a
2 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
lisp/ChangeLog
View File

@ -1,3 +1,7 @@
2006-01-13 Richard M. Stallman <rms@gnu.org>
* font-lock.el (lisp-font-lock-keywords-1): Minor rearrangement.
2006-01-16 Luc Teirlinck <teirllm@auburn.edu>
* cus-edit.el (customize-rogue): Minor doc fix.
@ -50,6 +54,7 @@
* time.el (display-time-mail-face): Replace :group `faces' with
`mode-line-faces'.
>>>>>>> 1.8983
2006-01-16 Kenichi Handa <handa@m17n.org>
* international/code-pages.el: Add autoload cookies for
@ -98,6 +103,7 @@
(Custom-reset-saved): Do not ask for confirmation in single option
buffers.
>>>>>>> 1.8978
2006-01-13 Romain Francoise <romain@orebokech.com>
* add-log.el (add-change-log-entry, change-log-merge):

4
lisp/font-lock.el
View File

@ -2043,14 +2043,14 @@ other modes in which C preprocessor directives are used. e.g. `asm-mode' and
`(;; Definitions.
(,(concat "(\\(def\\("
;; Function declarations.
"\\(advice\\|varalias\\|alias\\|generic\\|macro\\*?\\|method\\|"
"\\(advice\\|alias\\|generic\\|macro\\*?\\|method\\|"
"setf\\|subst\\*?\\|un\\*?\\|"
"ine-\\(condition\\|"
"\\(?:derived\\|\\(?:global-\\)?minor\\|generic\\)-mode\\|"
"method-combination\\|setf-expander\\|skeleton\\|widget\\|"
"function\\|\\(compiler\\|modify\\|symbol\\)-macro\\)\\)\\|"
;; Variable declarations.
"\\(const\\(ant\\)?\\|custom\\|face\\|parameter\\|var\\)\\|"
"\\(const\\(ant\\)?\\|custom\\|varalias\\|face\\|parameter\\|var\\)\\|"
;; Structure declarations.
"\\(class\\|group\\|theme\\|package\\|struct\\|type\\)"
"\\)\\)\\>"