(antlr-keyword, antlr-syntax)

(antlr-ruledef, antlr-tokendef, antlr-ruleref-face)
(antlr-tokenref, antlr-literal): Inherit from standard font-lock
faces in non-light-background case.

2 files changed, 32 insertions, 7 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index a8028f95994..b410c68015c 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,21 @@
+2007-12-06  Glenn Morris  <rgm@gnu.org>
+
+        * progmodes/antlr-mode.el (antlr-keyword, antlr-syntax)
+        (antlr-ruledef, antlr-tokendef, antlr-ruleref-face)
+        (antlr-tokenref, antlr-literal): Inherit from standard font-lock
+        faces in non-light-background case.
+
+        * add-log.el, dired-aux.el, font-lock.el, help-fns.el, ido.el:
+        * informat.el, emacs-lisp/bytecomp.el, emacs-lisp/gulp.el:
+        * emacs-lisp/tcover-ses.el, emacs-lisp/timer.el, emulation/edt.el:
+        * emulation/vi.el, emulation/viper-cmd.el:
+        * international/titdic-cnv.el, mail/emacsbug.el, progmodes/dcl.el:
+        * progmodes/prolog.el, progmodes/ps-mode.el, progmodes/python.el:
+        * textmodes/fill.el: Remove directory part from filenames in
+        function declarations.
+
+        * dired-aux.el (mailcap-mime-info): Update declaration.
+
 2007-12-05  Richard Stallman  <rms@gnu.org>
 
         * wid-edit.el (widget-type): Doc fix.
diff --git a/lisp/progmodes/antlr-mode.el b/lisp/progmodes/antlr-mode.el
index 01f1c86618c..9f6e70dcce5 100644
--- a/lisp/progmodes/antlr-mode.el
+++ b/lisp/progmodes/antlr-mode.el
@@ -840,7 +840,8 @@ Do not change."
 (defface antlr-keyword
   (cond-emacs-xemacs
    '((((class color) (background light))
-      (:foreground "black" :EMACS :weight bold :XEMACS :bold t))))
+      (:foreground "black" :EMACS :weight bold :XEMACS :bold t))
+     (t :inherit font-lock-keyword-face)))
   "ANTLR keywords."
   :group 'antlr)
 ;; backward-compatibility alias
@@ -850,7 +851,8 @@ Do not change."
 (defface antlr-syntax
   (cond-emacs-xemacs
    '((((class color) (background light))
-      (:foreground "black" :EMACS :weight bold :XEMACS :bold t))))
+      (:foreground "black" :EMACS :weight bold :XEMACS :bold t))
+     (t :inherit font-lock-constant-face)))
   "ANTLR syntax symbols like :, |, (, ), ...."
   :group 'antlr)
 ;; backward-compatibility alias
@@ -860,7 +862,8 @@ Do not change."
 (defface antlr-ruledef
   (cond-emacs-xemacs
    '((((class color) (background light))
-      (:foreground "blue" :EMACS :weight bold :XEMACS :bold t))))
+      (:foreground "blue" :EMACS :weight bold :XEMACS :bold t))
+     (t :inherit font-lock-function-name-face)))
   "ANTLR rule references (definition)."
   :group 'antlr)
 ;; backward-compatibility alias
@@ -870,7 +873,8 @@ Do not change."
 (defface antlr-tokendef
   (cond-emacs-xemacs
    '((((class color) (background light))
-      (:foreground "blue" :EMACS :weight bold :XEMACS :bold t))))
+      (:foreground "blue" :EMACS :weight bold :XEMACS :bold t))
+     (t :inherit font-lock-function-name-face)))
   "ANTLR token references (definition)."
   :group 'antlr)
 ;; backward-compatibility alias
@@ -878,7 +882,8 @@ Do not change."
 
 (defvar antlr-ruleref-face 'antlr-ruleref)
 (defface antlr-ruleref
-  '((((class color) (background light)) (:foreground "blue4")))
+  '((((class color) (background light)) (:foreground "blue4"))
+    (t :inherit font-lock-type-face))
   "ANTLR rule references (usage)."
   :group 'antlr)
 ;; backward-compatibility alias
@@ -886,7 +891,8 @@ Do not change."
 
 (defvar antlr-tokenref-face 'antlr-tokenref)
 (defface antlr-tokenref
-  '((((class color) (background light)) (:foreground "orange4")))
+  '((((class color) (background light)) (:foreground "orange4"))
+    (t :inherit font-lock-type-face))
   "ANTLR token references (usage)."
   :group 'antlr)
 ;; backward-compatibility alias
@@ -896,7 +902,8 @@ Do not change."
 (defface antlr-literal
   (cond-emacs-xemacs
    '((((class color) (background light))
-      (:foreground "brown4" :EMACS :weight bold :XEMACS :bold t))))
+      (:foreground "brown4" :EMACS :weight bold :XEMACS :bold t))
+     (t :inherit font-lock-string-face)))
   "ANTLR special literal tokens.
 It is used to highlight strings matched by the first regexp group of
 `antlr-font-lock-literal-regexp'."