From: Richard M. Stallman Date: Tue, 17 Jan 2006 14:32:16 +0000 (+0000) Subject: (lisp-font-lock-keywords-1): Minor rearrangement. X-Git-Tag: emacs-pretest-22.0.90~4713 X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=588fe8bc0a9478766a605101a90b9d861cbff2a2;p=emacs.git (lisp-font-lock-keywords-1): Minor rearrangement. --- diff --git a/lisp/ChangeLog b/lisp/ChangeLog index a907eb5876d..123d97749b4 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,7 @@ +2006-01-13 Richard M. Stallman + + * font-lock.el (lisp-font-lock-keywords-1): Minor rearrangement. + 2006-01-16 Luc Teirlinck * 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 * 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 * add-log.el (add-change-log-entry, change-log-merge): diff --git a/lisp/font-lock.el b/lisp/font-lock.el index 00394e86762..be857838ad2 100644 --- a/lisp/font-lock.el +++ b/lisp/font-lock.el @@ -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\\)" "\\)\\)\\>"