diff options
| author | Chong Yidong | 2011-12-06 10:22:48 +0800 |
|---|---|---|
| committer | Chong Yidong | 2011-12-06 10:22:48 +0800 |
| commit | 28d3917c738c44e79ca36c79f7a6d22b9a4f6fd2 (patch) | |
| tree | 94940cb487209f366f0878dca7238188db39d5d3 | |
| parent | a98edce9ec1f519ad23ba7dc32ce54f15841eaa5 (diff) | |
| download | emacs-28d3917c738c44e79ca36c79f7a6d22b9a4f6fd2.tar.gz emacs-28d3917c738c44e79ca36c79f7a6d22b9a4f6fd2.zip | |
* progmodes/cc-fonts.el (c-annotation-face): Use defface.
| -rw-r--r-- | lisp/ChangeLog | 4 | ||||
| -rw-r--r-- | lisp/progmodes/cc-fonts.el | 10 |
2 files changed, 11 insertions, 3 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 6657a9da7d9..c222302cc9d 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog | |||
| @@ -1,3 +1,7 @@ | |||
| 1 | 2011-12-06 Chong Yidong <cyd@gnu.org> | ||
| 2 | |||
| 3 | * progmodes/cc-fonts.el (c-annotation-face): Use defface. | ||
| 4 | |||
| 1 | 2011-12-06 Juanma Barranquero <lekktu@gmail.com> | 5 | 2011-12-06 Juanma Barranquero <lekktu@gmail.com> |
| 2 | 6 | ||
| 3 | * textmodes/table.el (table-shorten-cell): Fix typo. | 7 | * textmodes/table.el (table-shorten-cell): Fix typo. |
diff --git a/lisp/progmodes/cc-fonts.el b/lisp/progmodes/cc-fonts.el index a31de35f3ba..ac4d1bf9e57 100644 --- a/lisp/progmodes/cc-fonts.el +++ b/lisp/progmodes/cc-fonts.el | |||
| @@ -194,9 +194,13 @@ | |||
| 194 | (unless (face-property-instance oldface 'reverse) | 194 | (unless (face-property-instance oldface 'reverse) |
| 195 | (invert-face newface))))) | 195 | (invert-face newface))))) |
| 196 | 196 | ||
| 197 | (defvar c-annotation-face (make-face 'c-annotation-face) | 197 | (defvar c-annotation-face 'c-annotation-face) |
| 198 | "Face used to highlight annotations in java-mode and other modes that may wish to use it.") | 198 | |
| 199 | (set-face-foreground 'c-annotation-face "blue") | 199 | (defface c-annotation-face |
| 200 | '((default :inherit font-lock-constant-face)) | ||
| 201 | "Face for highlighting annotations in Java mode and similar modes." | ||
| 202 | :version "24.1" | ||
| 203 | :group 'c) | ||
| 200 | 204 | ||
| 201 | (eval-and-compile | 205 | (eval-and-compile |
| 202 | ;; We need the following definitions during compilation since they're | 206 | ;; We need the following definitions during compilation since they're |