diff lisp/gnus/gnus.el @ 90197:b7da78284d4c

Revision: [e-mail]--gnu-2005/emacs--unicode--0--patch-65 Merge from emacs--cvs-trunk--0 Patches applied: * emacs--cvs-trunk--0 (patch 425-445) - Remove "-face" suffix from gnus faces - Update from CVS - Remove "-face" suffix from MH-E faces - Remove "-face" suffix from cc-mode faces - Remove "-face" suffix from eshell faces - Remove "-face" suffix from ediff faces - Implement tty vertical-divider face - Rename vertical-divider face to vertical-border - Change escape-glyph color on dark backgrounds back to cyan - Update reference to renamed Buffer-menu-buffer face

--- a/lisp/gnus/gnus.el	Wed Jun 15 23:37:29 2005 +0000
+++ b/lisp/gnus/gnus.el	Fri Jun 24 01:59:52 2005 +0000
@@ -357,7 +357,7 @@
 ;; We define these group faces here to avoid the display
 ;; update forced when creating new faces.
 
-(defface gnus-group-news-1-face
+(defface gnus-group-news-1
   '((((class color)
       (background dark))
      (:foreground "PaleTurquoise" :bold t))
@@ -368,8 +368,10 @@
      ()))
   "Level 1 newsgroup face."
   :group 'gnus-group)
-
-(defface gnus-group-news-1-empty-face
+;; backward-compatibility alias
+(put 'gnus-group-news-1-face 'face-alias 'gnus-group-news-1)
+
+(defface gnus-group-news-1-empty
   '((((class color)
       (background dark))
      (:foreground "PaleTurquoise"))
@@ -380,8 +382,10 @@
      ()))
   "Level 1 empty newsgroup face."
   :group 'gnus-group)
-
-(defface gnus-group-news-2-face
+;; backward-compatibility alias
+(put 'gnus-group-news-1-empty-face 'face-alias 'gnus-group-news-1-empty)
+
+(defface gnus-group-news-2
   '((((class color)
       (background dark))
      (:foreground "turquoise" :bold t))
@@ -392,8 +396,10 @@
      ()))
   "Level 2 newsgroup face."
   :group 'gnus-group)
-
-(defface gnus-group-news-2-empty-face
+;; backward-compatibility alias
+(put 'gnus-group-news-2-face 'face-alias 'gnus-group-news-2)
+
+(defface gnus-group-news-2-empty
   '((((class color)
       (background dark))
      (:foreground "turquoise"))
@@ -404,8 +410,10 @@
      ()))
   "Level 2 empty newsgroup face."
   :group 'gnus-group)
-
-(defface gnus-group-news-3-face
+;; backward-compatibility alias
+(put 'gnus-group-news-2-empty-face 'face-alias 'gnus-group-news-2-empty)
+
+(defface gnus-group-news-3
   '((((class color)
       (background dark))
      (:bold t))
@@ -416,8 +424,10 @@
      ()))
   "Level 3 newsgroup face."
   :group 'gnus-group)
-
-(defface gnus-group-news-3-empty-face
+;; backward-compatibility alias
+(put 'gnus-group-news-3-face 'face-alias 'gnus-group-news-3)
+
+(defface gnus-group-news-3-empty
   '((((class color)
       (background dark))
      ())
@@ -428,8 +438,10 @@
      ()))
   "Level 3 empty newsgroup face."
   :group 'gnus-group)
-
-(defface gnus-group-news-4-face
+;; backward-compatibility alias
+(put 'gnus-group-news-3-empty-face 'face-alias 'gnus-group-news-3-empty)
+
+(defface gnus-group-news-4
   '((((class color)
       (background dark))
      (:bold t))
@@ -440,8 +452,10 @@
      ()))
   "Level 4 newsgroup face."
   :group 'gnus-group)
-
-(defface gnus-group-news-4-empty-face
+;; backward-compatibility alias
+(put 'gnus-group-news-4-face 'face-alias 'gnus-group-news-4)
+
+(defface gnus-group-news-4-empty
   '((((class color)
       (background dark))
      ())
@@ -452,8 +466,10 @@
      ()))
   "Level 4 empty newsgroup face."
   :group 'gnus-group)
-
-(defface gnus-group-news-5-face
+;; backward-compatibility alias
+(put 'gnus-group-news-4-empty-face 'face-alias 'gnus-group-news-4-empty)
+
+(defface gnus-group-news-5
   '((((class color)
       (background dark))
      (:bold t))
@@ -464,8 +480,10 @@
      ()))
   "Level 5 newsgroup face."
   :group 'gnus-group)
-
-(defface gnus-group-news-5-empty-face
+;; backward-compatibility alias
+(put 'gnus-group-news-5-face 'face-alias 'gnus-group-news-5)
+
+(defface gnus-group-news-5-empty
   '((((class color)
       (background dark))
      ())
@@ -476,8 +494,10 @@
      ()))
   "Level 5 empty newsgroup face."
   :group 'gnus-group)
-
-(defface gnus-group-news-6-face
+;; backward-compatibility alias
+(put 'gnus-group-news-5-empty-face 'face-alias 'gnus-group-news-5-empty)
+
+(defface gnus-group-news-6
   '((((class color)
       (background dark))
      (:bold t))
@@ -488,8 +508,10 @@
      ()))
   "Level 6 newsgroup face."
   :group 'gnus-group)
-
-(defface gnus-group-news-6-empty-face
+;; backward-compatibility alias
+(put 'gnus-group-news-6-face 'face-alias 'gnus-group-news-6)
+
+(defface gnus-group-news-6-empty
   '((((class color)
       (background dark))
      ())
@@ -500,8 +522,10 @@
      ()))
   "Level 6 empty newsgroup face."
   :group 'gnus-group)
-
-(defface gnus-group-news-low-face
+;; backward-compatibility alias
+(put 'gnus-group-news-6-empty-face 'face-alias 'gnus-group-news-6-empty)
+
+(defface gnus-group-news-low
   '((((class color)
       (background dark))
      (:foreground "DarkTurquoise" :bold t))
@@ -512,8 +536,10 @@
      ()))
   "Low level newsgroup face."
   :group 'gnus-group)
-
-(defface gnus-group-news-low-empty-face
+;; backward-compatibility alias
+(put 'gnus-group-news-low-face 'face-alias 'gnus-group-news-low)
+
+(defface gnus-group-news-low-empty
   '((((class color)
       (background dark))
      (:foreground "DarkTurquoise"))
@@ -524,8 +550,10 @@
      ()))
   "Low level empty newsgroup face."
   :group 'gnus-group)
-
-(defface gnus-group-mail-1-face
+;; backward-compatibility alias
+(put 'gnus-group-news-low-empty-face 'face-alias 'gnus-group-news-low-empty)
+
+(defface gnus-group-mail-1
   '((((class color)
       (background dark))
      (:foreground "aquamarine1" :bold t))
@@ -536,8 +564,10 @@
      (:bold t)))
   "Level 1 mailgroup face."
   :group 'gnus-group)
-
-(defface gnus-group-mail-1-empty-face
+;; backward-compatibility alias
+(put 'gnus-group-mail-1-face 'face-alias 'gnus-group-mail-1)
+
+(defface gnus-group-mail-1-empty
   '((((class color)
       (background dark))
      (:foreground "aquamarine1"))
@@ -548,8 +578,10 @@
      (:italic t :bold t)))
   "Level 1 empty mailgroup face."
   :group 'gnus-group)
-
-(defface gnus-group-mail-2-face
+;; backward-compatibility alias
+(put 'gnus-group-mail-1-empty-face 'face-alias 'gnus-group-mail-1-empty)
+
+(defface gnus-group-mail-2
   '((((class color)
       (background dark))
      (:foreground "aquamarine2" :bold t))
@@ -560,8 +592,10 @@
      (:bold t)))
   "Level 2 mailgroup face."
   :group 'gnus-group)
-
-(defface gnus-group-mail-2-empty-face
+;; backward-compatibility alias
+(put 'gnus-group-mail-2-face 'face-alias 'gnus-group-mail-2)
+
+(defface gnus-group-mail-2-empty
   '((((class color)
       (background dark))
      (:foreground "aquamarine2"))
@@ -572,8 +606,10 @@
      (:bold t)))
   "Level 2 empty mailgroup face."
   :group 'gnus-group)
-
-(defface gnus-group-mail-3-face
+;; backward-compatibility alias
+(put 'gnus-group-mail-2-empty-face 'face-alias 'gnus-group-mail-2-empty)
+
+(defface gnus-group-mail-3
   '((((class color)
       (background dark))
      (:foreground "aquamarine3" :bold t))
@@ -584,8 +620,10 @@
      (:bold t)))
   "Level 3 mailgroup face."
   :group 'gnus-group)
-
-(defface gnus-group-mail-3-empty-face
+;; backward-compatibility alias
+(put 'gnus-group-mail-3-face 'face-alias 'gnus-group-mail-3)
+
+(defface gnus-group-mail-3-empty
   '((((class color)
       (background dark))
      (:foreground "aquamarine3"))
@@ -596,8 +634,10 @@
      ()))
   "Level 3 empty mailgroup face."
   :group 'gnus-group)
-
-(defface gnus-group-mail-low-face
+;; backward-compatibility alias
+(put 'gnus-group-mail-3-empty-face 'face-alias 'gnus-group-mail-3-empty)
+
+(defface gnus-group-mail-low
   '((((class color)
       (background dark))
      (:foreground "aquamarine4" :bold t))
@@ -608,8 +648,10 @@
      (:bold t)))
   "Low level mailgroup face."
   :group 'gnus-group)
-
-(defface gnus-group-mail-low-empty-face
+;; backward-compatibility alias
+(put 'gnus-group-mail-low-face 'face-alias 'gnus-group-mail-low)
+
+(defface gnus-group-mail-low-empty
   '((((class color)
       (background dark))
      (:foreground "aquamarine4"))
@@ -620,21 +662,26 @@
      (:bold t)))
   "Low level empty mailgroup face."
   :group 'gnus-group)
+;; backward-compatibility alias
+(put 'gnus-group-mail-low-empty-face 'face-alias 'gnus-group-mail-low-empty)
 
 ;; Summary mode faces.
 
-(defface gnus-summary-selected-face '((t
-				       (:underline t)))
+(defface gnus-summary-selected '((t (:underline t)))
   "Face used for selected articles."
   :group 'gnus-summary)
-
-(defface gnus-summary-cancelled-face
+;; backward-compatibility alias
+(put 'gnus-summary-selected-face 'face-alias 'gnus-summary-selected)
+
+(defface gnus-summary-cancelled
   '((((class color))
      (:foreground "yellow" :background "black")))
   "Face used for cancelled articles."
   :group 'gnus-summary)
-
-(defface gnus-summary-high-ticked-face
+;; backward-compatibility alias
+(put 'gnus-summary-cancelled-face 'face-alias 'gnus-summary-cancelled)
+
+(defface gnus-summary-high-ticked
   '((((class color)
       (background dark))
      (:foreground "pink" :bold t))
@@ -645,8 +692,10 @@
      (:bold t)))
   "Face used for high interest ticked articles."
   :group 'gnus-summary)
-
-(defface gnus-summary-low-ticked-face
+;; backward-compatibility alias
+(put 'gnus-summary-high-ticked-face 'face-alias 'gnus-summary-high-ticked)
+
+(defface gnus-summary-low-ticked
   '((((class color)
       (background dark))
      (:foreground "pink" :italic t))
@@ -657,8 +706,10 @@
      (:italic t)))
   "Face used for low interest ticked articles."
   :group 'gnus-summary)
-
-(defface gnus-summary-normal-ticked-face
+;; backward-compatibility alias
+(put 'gnus-summary-low-ticked-face 'face-alias 'gnus-summary-low-ticked)
+
+(defface gnus-summary-normal-ticked
   '((((class color)
       (background dark))
      (:foreground "pink"))
@@ -669,8 +720,10 @@
      ()))
   "Face used for normal interest ticked articles."
   :group 'gnus-summary)
-
-(defface gnus-summary-high-ancient-face
+;; backward-compatibility alias
+(put 'gnus-summary-normal-ticked-face 'face-alias 'gnus-summary-normal-ticked)
+
+(defface gnus-summary-high-ancient
   '((((class color)
       (background dark))
      (:foreground "SkyBlue" :bold t))
@@ -681,8 +734,10 @@
      (:bold t)))
   "Face used for high interest ancient articles."
   :group 'gnus-summary)
-
-(defface gnus-summary-low-ancient-face
+;; backward-compatibility alias
+(put 'gnus-summary-high-ancient-face 'face-alias 'gnus-summary-high-ancient)
+
+(defface gnus-summary-low-ancient
   '((((class color)
       (background dark))
      (:foreground "SkyBlue" :italic t))
@@ -693,8 +748,10 @@
      (:italic t)))
   "Face used for low interest ancient articles."
   :group 'gnus-summary)
-
-(defface gnus-summary-normal-ancient-face
+;; backward-compatibility alias
+(put 'gnus-summary-low-ancient-face 'face-alias 'gnus-summary-low-ancient)
+
+(defface gnus-summary-normal-ancient
   '((((class color)
       (background dark))
      (:foreground "SkyBlue"))
@@ -705,8 +762,10 @@
      ()))
   "Face used for normal interest ancient articles."
   :group 'gnus-summary)
-
-(defface gnus-summary-high-undownloaded-face
+;; backward-compatibility alias
+(put 'gnus-summary-normal-ancient-face 'face-alias 'gnus-summary-normal-ancient)
+
+(defface gnus-summary-high-undownloaded
    '((((class color)
        (background light))
       (:bold t :foreground "cyan4"))
@@ -715,8 +774,10 @@
      (t (:inverse-video t :bold t)))
   "Face used for high interest uncached articles."
   :group 'gnus-summary)
-
-(defface gnus-summary-low-undownloaded-face
+;; backward-compatibility alias
+(put 'gnus-summary-high-undownloaded-face 'face-alias 'gnus-summary-high-undownloaded)
+
+(defface gnus-summary-low-undownloaded
    '((((class color)
        (background light))
       (:italic t :foreground "cyan4" :bold nil))
@@ -725,8 +786,10 @@
      (t (:inverse-video t :italic t)))
   "Face used for low interest uncached articles."
   :group 'gnus-summary)
-
-(defface gnus-summary-normal-undownloaded-face
+;; backward-compatibility alias
+(put 'gnus-summary-low-undownloaded-face 'face-alias 'gnus-summary-low-undownloaded)
+
+(defface gnus-summary-normal-undownloaded
    '((((class color)
        (background light))
       (:foreground "cyan4" :bold nil))
@@ -735,26 +798,34 @@
      (t (:inverse-video t)))
   "Face used for normal interest uncached articles."
   :group 'gnus-summary)
-
-(defface gnus-summary-high-unread-face
+;; backward-compatibility alias
+(put 'gnus-summary-normal-undownloaded-face 'face-alias 'gnus-summary-normal-undownloaded)
+
+(defface gnus-summary-high-unread
   '((t
      (:bold t)))
   "Face used for high interest unread articles."
   :group 'gnus-summary)
-
-(defface gnus-summary-low-unread-face
+;; backward-compatibility alias
+(put 'gnus-summary-high-unread-face 'face-alias 'gnus-summary-high-unread)
+
+(defface gnus-summary-low-unread
   '((t
      (:italic t)))
   "Face used for low interest unread articles."
   :group 'gnus-summary)
-
-(defface gnus-summary-normal-unread-face
+;; backward-compatibility alias
+(put 'gnus-summary-low-unread-face 'face-alias 'gnus-summary-low-unread)
+
+(defface gnus-summary-normal-unread
   '((t
      ()))
   "Face used for normal interest unread articles."
   :group 'gnus-summary)
-
-(defface gnus-summary-high-read-face
+;; backward-compatibility alias
+(put 'gnus-summary-normal-unread-face 'face-alias 'gnus-summary-normal-unread)
+
+(defface gnus-summary-high-read
   '((((class color)
       (background dark))
      (:foreground "PaleGreen"
@@ -767,8 +838,10 @@
      (:bold t)))
   "Face used for high interest read articles."
   :group 'gnus-summary)
-
-(defface gnus-summary-low-read-face
+;; backward-compatibility alias
+(put 'gnus-summary-high-read-face 'face-alias 'gnus-summary-high-read)
+
+(defface gnus-summary-low-read
   '((((class color)
       (background dark))
      (:foreground "PaleGreen"
@@ -781,8 +854,10 @@
      (:italic t)))
   "Face used for low interest read articles."
   :group 'gnus-summary)
-
-(defface gnus-summary-normal-read-face
+;; backward-compatibility alias
+(put 'gnus-summary-low-read-face 'face-alias 'gnus-summary-low-read)
+
+(defface gnus-summary-normal-read
   '((((class color)
       (background dark))
      (:foreground "PaleGreen"))
@@ -793,6 +868,8 @@
      ()))
   "Face used for normal interest read articles."
   :group 'gnus-summary)
+;; backward-compatibility alias
+(put 'gnus-summary-normal-read-face 'face-alias 'gnus-summary-normal-read)
 
 
 ;;;
@@ -836,7 +913,7 @@
 (eval-and-compile
   (autoload 'gnus-play-jingle "gnus-audio"))
 
-(defface gnus-splash-face
+(defface gnus-splash
   '((((class color)
       (background dark))
      (:foreground "#888888"))
@@ -847,6 +924,8 @@
      ()))
   "Face for the splash screen."
   :group 'gnus)
+;; backward-compatibility alias
+(put 'gnus-splash-face 'face-alias 'gnus-splash)
 
 (defun gnus-splash ()
   (save-excursion
@@ -925,11 +1004,11 @@
 			      ("background" . ,(face-background 'default))))
 		      (:type pbm :file "gnus.pbm"
 			     ;; Account for the pbm's blackground.
-			     :background ,(face-foreground 'gnus-splash-face)
+			     :background ,(face-foreground 'gnus-splash)
 			     :foreground ,(face-background 'default))
 		      (:type xbm :file "gnus.xbm"
 			     ;; Account for the xbm's blackground.
-			     :background ,(face-foreground 'gnus-splash-face)
+			     :background ,(face-foreground 'gnus-splash)
 			     :foreground ,(face-background 'default))))))
        (when image
 	 (let ((size (image-size image)))
@@ -973,7 +1052,7 @@
 	   (rest (- wheight pheight)))
       (insert (make-string (max 0 (* 2 (/ rest 3))) ?\n)))
     ;; Fontify some.
-    (put-text-property (point-min) (point-max) 'face 'gnus-splash-face)
+    (put-text-property (point-min) (point-max) 'face 'gnus-splash)
     (setq gnus-simple-splash t)))
   (goto-char (point-min))
   (setq mode-line-buffer-identification (concat " " gnus-version))