summaryrefslogtreecommitdiff
path: root/lisp
diff options
context:
space:
mode:
authorChong Yidong <cyd@gnu.org>2011-12-06 10:22:48 +0800
committerChong Yidong <cyd@gnu.org>2011-12-06 10:22:48 +0800
commit28d3917c738c44e79ca36c79f7a6d22b9a4f6fd2 (patch)
tree94940cb487209f366f0878dca7238188db39d5d3 /lisp
parenta98edce9ec1f519ad23ba7dc32ce54f15841eaa5 (diff)
downloademacs-28d3917c738c44e79ca36c79f7a6d22b9a4f6fd2.tar.gz
emacs-28d3917c738c44e79ca36c79f7a6d22b9a4f6fd2.tar.bz2
emacs-28d3917c738c44e79ca36c79f7a6d22b9a4f6fd2.zip
* progmodes/cc-fonts.el (c-annotation-face): Use defface.
Diffstat (limited to 'lisp')
-rw-r--r--lisp/ChangeLog4
-rw-r--r--lisp/progmodes/cc-fonts.el10
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 @@
+2011-12-06 Chong Yidong <cyd@gnu.org>
+
+ * progmodes/cc-fonts.el (c-annotation-face): Use defface.
+
2011-12-06 Juanma Barranquero <lekktu@gmail.com>
* 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 @@
(unless (face-property-instance oldface 'reverse)
(invert-face newface)))))
-(defvar c-annotation-face (make-face 'c-annotation-face)
- "Face used to highlight annotations in java-mode and other modes that may wish to use it.")
-(set-face-foreground 'c-annotation-face "blue")
+(defvar c-annotation-face 'c-annotation-face)
+
+(defface c-annotation-face
+ '((default :inherit font-lock-constant-face))
+ "Face for highlighting annotations in Java mode and similar modes."
+ :version "24.1"
+ :group 'c)
(eval-and-compile
;; We need the following definitions during compilation since they're