aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--lisp/gnus/gnus-art.el18
-rw-r--r--lisp/gnus/gnus-cite.el36
-rw-r--r--lisp/gnus/gnus-srvr.el15
-rw-r--r--lisp/gnus/gnus.el120
-rw-r--r--lisp/gnus/spam.el3
5 files changed, 0 insertions, 192 deletions
diff --git a/lisp/gnus/gnus-art.el b/lisp/gnus/gnus-art.el
index cf1ec25f96b..f23b910ed2c 100644
--- a/lisp/gnus/gnus-art.el
+++ b/lisp/gnus/gnus-art.el
@@ -761,9 +761,6 @@ Obsolete; use the face `gnus-signature' for customizations instead."
761 "Face used for highlighting a signature in the article buffer." 761 "Face used for highlighting a signature in the article buffer."
762 :group 'gnus-article-highlight 762 :group 'gnus-article-highlight
763 :group 'gnus-article-signature) 763 :group 'gnus-article-signature)
764;; backward-compatibility alias
765(put 'gnus-signature-face 'face-alias 'gnus-signature)
766(put 'gnus-signature-face 'obsolete-face "22.1")
767 764
768(defface gnus-header-from 765(defface gnus-header-from
769 '((((class color) 766 '((((class color)
@@ -777,9 +774,6 @@ Obsolete; use the face `gnus-signature' for customizations instead."
777 "Face used for displaying from headers." 774 "Face used for displaying from headers."
778 :group 'gnus-article-headers 775 :group 'gnus-article-headers
779 :group 'gnus-article-highlight) 776 :group 'gnus-article-highlight)
780;; backward-compatibility alias
781(put 'gnus-header-from-face 'face-alias 'gnus-header-from)
782(put 'gnus-header-from-face 'obsolete-face "22.1")
783 777
784(defface gnus-header-subject 778(defface gnus-header-subject
785 '((((class color) 779 '((((class color)
@@ -793,9 +787,6 @@ Obsolete; use the face `gnus-signature' for customizations instead."
793 "Face used for displaying subject headers." 787 "Face used for displaying subject headers."
794 :group 'gnus-article-headers 788 :group 'gnus-article-headers
795 :group 'gnus-article-highlight) 789 :group 'gnus-article-highlight)
796;; backward-compatibility alias
797(put 'gnus-header-subject-face 'face-alias 'gnus-header-subject)
798(put 'gnus-header-subject-face 'obsolete-face "22.1")
799 790
800(defface gnus-header-newsgroups 791(defface gnus-header-newsgroups
801 '((((class color) 792 '((((class color)
@@ -811,9 +802,6 @@ In the default setup this face is only used for crossposted
811articles." 802articles."
812 :group 'gnus-article-headers 803 :group 'gnus-article-headers
813 :group 'gnus-article-highlight) 804 :group 'gnus-article-highlight)
814;; backward-compatibility alias
815(put 'gnus-header-newsgroups-face 'face-alias 'gnus-header-newsgroups)
816(put 'gnus-header-newsgroups-face 'obsolete-face "22.1")
817 805
818(defface gnus-header-name 806(defface gnus-header-name
819 '((((class color) 807 '((((class color)
@@ -827,9 +815,6 @@ articles."
827 "Face used for displaying header names." 815 "Face used for displaying header names."
828 :group 'gnus-article-headers 816 :group 'gnus-article-headers
829 :group 'gnus-article-highlight) 817 :group 'gnus-article-highlight)
830;; backward-compatibility alias
831(put 'gnus-header-name-face 'face-alias 'gnus-header-name)
832(put 'gnus-header-name-face 'obsolete-face "22.1")
833 818
834(defface gnus-header-content 819(defface gnus-header-content
835 '((((class color) 820 '((((class color)
@@ -842,9 +827,6 @@ articles."
842 (:italic t))) "Face used for displaying header content." 827 (:italic t))) "Face used for displaying header content."
843 :group 'gnus-article-headers 828 :group 'gnus-article-headers
844 :group 'gnus-article-highlight) 829 :group 'gnus-article-highlight)
845;; backward-compatibility alias
846(put 'gnus-header-content-face 'face-alias 'gnus-header-content)
847(put 'gnus-header-content-face 'obsolete-face "22.1")
848 830
849(defcustom gnus-header-face-alist 831(defcustom gnus-header-face-alist
850 '(("From" nil gnus-header-from) 832 '(("From" nil gnus-header-from)
diff --git a/lisp/gnus/gnus-cite.el b/lisp/gnus/gnus-cite.el
index 386593be026..07a84940269 100644
--- a/lisp/gnus/gnus-cite.el
+++ b/lisp/gnus/gnus-cite.el
@@ -136,9 +136,6 @@ the envelope From line."
136(defface gnus-cite-attribution '((t (:italic t))) 136(defface gnus-cite-attribution '((t (:italic t)))
137 "Face used for attribution lines." 137 "Face used for attribution lines."
138 :group 'gnus-cite) 138 :group 'gnus-cite)
139;; backward-compatibility alias
140(put 'gnus-cite-attribution-face 'face-alias 'gnus-cite-attribution)
141(put 'gnus-cite-attribution-face 'obsolete-face "22.1")
142 139
143(defcustom gnus-cite-attribution-face 'gnus-cite-attribution 140(defcustom gnus-cite-attribution-face 'gnus-cite-attribution
144 "Face used for attribution lines. 141 "Face used for attribution lines.
@@ -157,9 +154,6 @@ It is merged with the face for the cited text belonging to the attribution."
157 (:italic t))) 154 (:italic t)))
158 "Citation face." 155 "Citation face."
159 :group 'gnus-cite) 156 :group 'gnus-cite)
160;; backward-compatibility alias
161(put 'gnus-cite-face-1 'face-alias 'gnus-cite-1)
162(put 'gnus-cite-face-1 'obsolete-face "22.1")
163 157
164(defface gnus-cite-2 '((((class color) 158(defface gnus-cite-2 '((((class color)
165 (background dark)) 159 (background dark))
@@ -171,9 +165,6 @@ It is merged with the face for the cited text belonging to the attribution."
171 (:italic t))) 165 (:italic t)))
172 "Citation face." 166 "Citation face."
173 :group 'gnus-cite) 167 :group 'gnus-cite)
174;; backward-compatibility alias
175(put 'gnus-cite-face-2 'face-alias 'gnus-cite-2)
176(put 'gnus-cite-face-2 'obsolete-face "22.1")
177 168
178(defface gnus-cite-3 '((((class color) 169(defface gnus-cite-3 '((((class color)
179 (background dark)) 170 (background dark))
@@ -185,9 +176,6 @@ It is merged with the face for the cited text belonging to the attribution."
185 (:italic t))) 176 (:italic t)))
186 "Citation face." 177 "Citation face."
187 :group 'gnus-cite) 178 :group 'gnus-cite)
188;; backward-compatibility alias
189(put 'gnus-cite-face-3 'face-alias 'gnus-cite-3)
190(put 'gnus-cite-face-3 'obsolete-face "22.1")
191 179
192(defface gnus-cite-4 '((((class color) 180(defface gnus-cite-4 '((((class color)
193 (background dark)) 181 (background dark))
@@ -199,9 +187,6 @@ It is merged with the face for the cited text belonging to the attribution."
199 (:italic t))) 187 (:italic t)))
200 "Citation face." 188 "Citation face."
201 :group 'gnus-cite) 189 :group 'gnus-cite)
202;; backward-compatibility alias
203(put 'gnus-cite-face-4 'face-alias 'gnus-cite-4)
204(put 'gnus-cite-face-4 'obsolete-face "22.1")
205 190
206(defface gnus-cite-5 '((((class color) 191(defface gnus-cite-5 '((((class color)
207 (background dark)) 192 (background dark))
@@ -213,9 +198,6 @@ It is merged with the face for the cited text belonging to the attribution."
213 (:italic t))) 198 (:italic t)))
214 "Citation face." 199 "Citation face."
215 :group 'gnus-cite) 200 :group 'gnus-cite)
216;; backward-compatibility alias
217(put 'gnus-cite-face-5 'face-alias 'gnus-cite-5)
218(put 'gnus-cite-face-5 'obsolete-face "22.1")
219 201
220(defface gnus-cite-6 '((((class color) 202(defface gnus-cite-6 '((((class color)
221 (background dark)) 203 (background dark))
@@ -227,9 +209,6 @@ It is merged with the face for the cited text belonging to the attribution."
227 (:italic t))) 209 (:italic t)))
228 "Citation face." 210 "Citation face."
229 :group 'gnus-cite) 211 :group 'gnus-cite)
230;; backward-compatibility alias
231(put 'gnus-cite-face-6 'face-alias 'gnus-cite-6)
232(put 'gnus-cite-face-6 'obsolete-face "22.1")
233 212
234(defface gnus-cite-7 '((((class color) 213(defface gnus-cite-7 '((((class color)
235 (background dark)) 214 (background dark))
@@ -241,9 +220,6 @@ It is merged with the face for the cited text belonging to the attribution."
241 (:italic t))) 220 (:italic t)))
242 "Citation face." 221 "Citation face."
243 :group 'gnus-cite) 222 :group 'gnus-cite)
244;; backward-compatibility alias
245(put 'gnus-cite-face-7 'face-alias 'gnus-cite-7)
246(put 'gnus-cite-face-7 'obsolete-face "22.1")
247 223
248(defface gnus-cite-8 '((((class color) 224(defface gnus-cite-8 '((((class color)
249 (background dark)) 225 (background dark))
@@ -255,9 +231,6 @@ It is merged with the face for the cited text belonging to the attribution."
255 (:italic t))) 231 (:italic t)))
256 "Citation face." 232 "Citation face."
257 :group 'gnus-cite) 233 :group 'gnus-cite)
258;; backward-compatibility alias
259(put 'gnus-cite-face-8 'face-alias 'gnus-cite-8)
260(put 'gnus-cite-face-8 'obsolete-face "22.1")
261 234
262(defface gnus-cite-9 '((((class color) 235(defface gnus-cite-9 '((((class color)
263 (background dark)) 236 (background dark))
@@ -269,9 +242,6 @@ It is merged with the face for the cited text belonging to the attribution."
269 (:italic t))) 242 (:italic t)))
270 "Citation face." 243 "Citation face."
271 :group 'gnus-cite) 244 :group 'gnus-cite)
272;; backward-compatibility alias
273(put 'gnus-cite-face-9 'face-alias 'gnus-cite-9)
274(put 'gnus-cite-face-9 'obsolete-face "22.1")
275 245
276(defface gnus-cite-10 '((((class color) 246(defface gnus-cite-10 '((((class color)
277 (background dark)) 247 (background dark))
@@ -283,9 +253,6 @@ It is merged with the face for the cited text belonging to the attribution."
283 (:italic t))) 253 (:italic t)))
284 "Citation face." 254 "Citation face."
285 :group 'gnus-cite) 255 :group 'gnus-cite)
286;; backward-compatibility alias
287(put 'gnus-cite-face-10 'face-alias 'gnus-cite-10)
288(put 'gnus-cite-face-10 'obsolete-face "22.1")
289 256
290(defface gnus-cite-11 '((((class color) 257(defface gnus-cite-11 '((((class color)
291 (background dark)) 258 (background dark))
@@ -297,9 +264,6 @@ It is merged with the face for the cited text belonging to the attribution."
297 (:italic t))) 264 (:italic t)))
298 "Citation face." 265 "Citation face."
299 :group 'gnus-cite) 266 :group 'gnus-cite)
300;; backward-compatibility alias
301(put 'gnus-cite-face-11 'face-alias 'gnus-cite-11)
302(put 'gnus-cite-face-11 'obsolete-face "22.1")
303 267
304(defcustom gnus-cite-face-list 268(defcustom gnus-cite-face-list
305 '(gnus-cite-1 gnus-cite-2 gnus-cite-3 gnus-cite-4 gnus-cite-5 gnus-cite-6 269 '(gnus-cite-1 gnus-cite-2 gnus-cite-3 gnus-cite-4 gnus-cite-5 gnus-cite-6
diff --git a/lisp/gnus/gnus-srvr.el b/lisp/gnus/gnus-srvr.el
index 9ba7a15c912..6c6c3b7e30e 100644
--- a/lisp/gnus/gnus-srvr.el
+++ b/lisp/gnus/gnus-srvr.el
@@ -200,9 +200,6 @@ If nil, a faster, but more primitive, buffer is used instead."
200 (t (:bold t))) 200 (t (:bold t)))
201 "Face used for displaying AGENTIZED servers" 201 "Face used for displaying AGENTIZED servers"
202 :group 'gnus-server-visual) 202 :group 'gnus-server-visual)
203;; backward-compatibility alias
204(put 'gnus-server-agent-face 'face-alias 'gnus-server-agent)
205(put 'gnus-server-agent-face 'obsolete-face "22.1")
206 203
207(defface gnus-server-cloud 204(defface gnus-server-cloud
208 '((((class color) (background light)) (:foreground "ForestGreen" :bold t)) 205 '((((class color) (background light)) (:foreground "ForestGreen" :bold t))
@@ -224,9 +221,6 @@ If nil, a faster, but more primitive, buffer is used instead."
224 (t (:bold t))) 221 (t (:bold t)))
225 "Face used for displaying OPENED servers" 222 "Face used for displaying OPENED servers"
226 :group 'gnus-server-visual) 223 :group 'gnus-server-visual)
227;; backward-compatibility alias
228(put 'gnus-server-opened-face 'face-alias 'gnus-server-opened)
229(put 'gnus-server-opened-face 'obsolete-face "22.1")
230 224
231(defface gnus-server-closed 225(defface gnus-server-closed
232 '((((class color) (background light)) (:foreground "Steel Blue" :italic t)) 226 '((((class color) (background light)) (:foreground "Steel Blue" :italic t))
@@ -235,9 +229,6 @@ If nil, a faster, but more primitive, buffer is used instead."
235 (t (:italic t))) 229 (t (:italic t)))
236 "Face used for displaying CLOSED servers" 230 "Face used for displaying CLOSED servers"
237 :group 'gnus-server-visual) 231 :group 'gnus-server-visual)
238;; backward-compatibility alias
239(put 'gnus-server-closed-face 'face-alias 'gnus-server-closed)
240(put 'gnus-server-closed-face 'obsolete-face "22.1")
241 232
242(defface gnus-server-denied 233(defface gnus-server-denied
243 '((((class color) (background light)) (:foreground "Red" :bold t)) 234 '((((class color) (background light)) (:foreground "Red" :bold t))
@@ -245,9 +236,6 @@ If nil, a faster, but more primitive, buffer is used instead."
245 (t (:inverse-video t :bold t))) 236 (t (:inverse-video t :bold t)))
246 "Face used for displaying DENIED servers" 237 "Face used for displaying DENIED servers"
247 :group 'gnus-server-visual) 238 :group 'gnus-server-visual)
248;; backward-compatibility alias
249(put 'gnus-server-denied-face 'face-alias 'gnus-server-denied)
250(put 'gnus-server-denied-face 'obsolete-face "22.1")
251 239
252(defface gnus-server-offline 240(defface gnus-server-offline
253 '((((class color) (background light)) (:foreground "Orange" :bold t)) 241 '((((class color) (background light)) (:foreground "Orange" :bold t))
@@ -255,9 +243,6 @@ If nil, a faster, but more primitive, buffer is used instead."
255 (t (:inverse-video t :bold t))) 243 (t (:inverse-video t :bold t)))
256 "Face used for displaying OFFLINE servers" 244 "Face used for displaying OFFLINE servers"
257 :group 'gnus-server-visual) 245 :group 'gnus-server-visual)
258;; backward-compatibility alias
259(put 'gnus-server-offline-face 'face-alias 'gnus-server-offline)
260(put 'gnus-server-offline-face 'obsolete-face "22.1")
261 246
262(defvar gnus-server-font-lock-keywords 247(defvar gnus-server-font-lock-keywords
263 '(("(\\(agent\\))" 1 'gnus-server-agent) 248 '(("(\\(agent\\))" 1 'gnus-server-agent)
diff --git a/lisp/gnus/gnus.el b/lisp/gnus/gnus.el
index 0ed5491ead5..0edde630fcb 100644
--- a/lisp/gnus/gnus.el
+++ b/lisp/gnus/gnus.el
@@ -347,17 +347,11 @@ be set in `.emacs' instead."
347 ())) 347 ()))
348 "Level 1 empty newsgroup face." 348 "Level 1 empty newsgroup face."
349 :group 'gnus-group) 349 :group 'gnus-group)
350;; backward-compatibility alias
351(put 'gnus-group-news-1-empty-face 'face-alias 'gnus-group-news-1-empty)
352(put 'gnus-group-news-1-empty-face 'obsolete-face "22.1")
353 350
354(defface gnus-group-news-1 351(defface gnus-group-news-1
355 '((t (:inherit gnus-group-news-1-empty :bold t))) 352 '((t (:inherit gnus-group-news-1-empty :bold t)))
356 "Level 1 newsgroup face." 353 "Level 1 newsgroup face."
357 :group 'gnus-group) 354 :group 'gnus-group)
358;; backward-compatibility alias
359(put 'gnus-group-news-1-face 'face-alias 'gnus-group-news-1)
360(put 'gnus-group-news-1-face 'obsolete-face "22.1")
361 355
362(defface gnus-group-news-2-empty 356(defface gnus-group-news-2-empty
363 '((((class color) 357 '((((class color)
@@ -370,17 +364,11 @@ be set in `.emacs' instead."
370 ())) 364 ()))
371 "Level 2 empty newsgroup face." 365 "Level 2 empty newsgroup face."
372 :group 'gnus-group) 366 :group 'gnus-group)
373;; backward-compatibility alias
374(put 'gnus-group-news-2-empty-face 'face-alias 'gnus-group-news-2-empty)
375(put 'gnus-group-news-2-empty-face 'obsolete-face "22.1")
376 367
377(defface gnus-group-news-2 368(defface gnus-group-news-2
378 '((t (:inherit gnus-group-news-2-empty :bold t))) 369 '((t (:inherit gnus-group-news-2-empty :bold t)))
379 "Level 2 newsgroup face." 370 "Level 2 newsgroup face."
380 :group 'gnus-group) 371 :group 'gnus-group)
381;; backward-compatibility alias
382(put 'gnus-group-news-2-face 'face-alias 'gnus-group-news-2)
383(put 'gnus-group-news-2-face 'obsolete-face "22.1")
384 372
385(defface gnus-group-news-3-empty 373(defface gnus-group-news-3-empty
386 '((((class color) 374 '((((class color)
@@ -393,17 +381,11 @@ be set in `.emacs' instead."
393 ())) 381 ()))
394 "Level 3 empty newsgroup face." 382 "Level 3 empty newsgroup face."
395 :group 'gnus-group) 383 :group 'gnus-group)
396;; backward-compatibility alias
397(put 'gnus-group-news-3-empty-face 'face-alias 'gnus-group-news-3-empty)
398(put 'gnus-group-news-3-empty-face 'obsolete-face "22.1")
399 384
400(defface gnus-group-news-3 385(defface gnus-group-news-3
401 '((t (:inherit gnus-group-news-3-empty :bold t))) 386 '((t (:inherit gnus-group-news-3-empty :bold t)))
402 "Level 3 newsgroup face." 387 "Level 3 newsgroup face."
403 :group 'gnus-group) 388 :group 'gnus-group)
404;; backward-compatibility alias
405(put 'gnus-group-news-3-face 'face-alias 'gnus-group-news-3)
406(put 'gnus-group-news-3-face 'obsolete-face "22.1")
407 389
408(defface gnus-group-news-4-empty 390(defface gnus-group-news-4-empty
409 '((((class color) 391 '((((class color)
@@ -416,17 +398,11 @@ be set in `.emacs' instead."
416 ())) 398 ()))
417 "Level 4 empty newsgroup face." 399 "Level 4 empty newsgroup face."
418 :group 'gnus-group) 400 :group 'gnus-group)
419;; backward-compatibility alias
420(put 'gnus-group-news-4-empty-face 'face-alias 'gnus-group-news-4-empty)
421(put 'gnus-group-news-4-empty-face 'obsolete-face "22.1")
422 401
423(defface gnus-group-news-4 402(defface gnus-group-news-4
424 '((t (:inherit gnus-group-news-4-empty :bold t))) 403 '((t (:inherit gnus-group-news-4-empty :bold t)))
425 "Level 4 newsgroup face." 404 "Level 4 newsgroup face."
426 :group 'gnus-group) 405 :group 'gnus-group)
427;; backward-compatibility alias
428(put 'gnus-group-news-4-face 'face-alias 'gnus-group-news-4)
429(put 'gnus-group-news-4-face 'obsolete-face "22.1")
430 406
431(defface gnus-group-news-5-empty 407(defface gnus-group-news-5-empty
432 '((((class color) 408 '((((class color)
@@ -439,17 +415,11 @@ be set in `.emacs' instead."
439 ())) 415 ()))
440 "Level 5 empty newsgroup face." 416 "Level 5 empty newsgroup face."
441 :group 'gnus-group) 417 :group 'gnus-group)
442;; backward-compatibility alias
443(put 'gnus-group-news-5-empty-face 'face-alias 'gnus-group-news-5-empty)
444(put 'gnus-group-news-5-empty-face 'obsolete-face "22.1")
445 418
446(defface gnus-group-news-5 419(defface gnus-group-news-5
447 '((t (:inherit gnus-group-news-5-empty :bold t))) 420 '((t (:inherit gnus-group-news-5-empty :bold t)))
448 "Level 5 newsgroup face." 421 "Level 5 newsgroup face."
449 :group 'gnus-group) 422 :group 'gnus-group)
450;; backward-compatibility alias
451(put 'gnus-group-news-5-face 'face-alias 'gnus-group-news-5)
452(put 'gnus-group-news-5-face 'obsolete-face "22.1")
453 423
454(defface gnus-group-news-6-empty 424(defface gnus-group-news-6-empty
455 '((((class color) 425 '((((class color)
@@ -462,17 +432,11 @@ be set in `.emacs' instead."
462 ())) 432 ()))
463 "Level 6 empty newsgroup face." 433 "Level 6 empty newsgroup face."
464 :group 'gnus-group) 434 :group 'gnus-group)
465;; backward-compatibility alias
466(put 'gnus-group-news-6-empty-face 'face-alias 'gnus-group-news-6-empty)
467(put 'gnus-group-news-6-empty-face 'obsolete-face "22.1")
468 435
469(defface gnus-group-news-6 436(defface gnus-group-news-6
470 '((t (:inherit gnus-group-news-6-empty :bold t))) 437 '((t (:inherit gnus-group-news-6-empty :bold t)))
471 "Level 6 newsgroup face." 438 "Level 6 newsgroup face."
472 :group 'gnus-group) 439 :group 'gnus-group)
473;; backward-compatibility alias
474(put 'gnus-group-news-6-face 'face-alias 'gnus-group-news-6)
475(put 'gnus-group-news-6-face 'obsolete-face "22.1")
476 440
477(defface gnus-group-news-low-empty 441(defface gnus-group-news-low-empty
478 '((((class color) 442 '((((class color)
@@ -485,17 +449,11 @@ be set in `.emacs' instead."
485 ())) 449 ()))
486 "Low level empty newsgroup face." 450 "Low level empty newsgroup face."
487 :group 'gnus-group) 451 :group 'gnus-group)
488;; backward-compatibility alias
489(put 'gnus-group-news-low-empty-face 'face-alias 'gnus-group-news-low-empty)
490(put 'gnus-group-news-low-empty-face 'obsolete-face "22.1")
491 452
492(defface gnus-group-news-low 453(defface gnus-group-news-low
493 '((t (:inherit gnus-group-news-low-empty :bold t))) 454 '((t (:inherit gnus-group-news-low-empty :bold t)))
494 "Low level newsgroup face." 455 "Low level newsgroup face."
495 :group 'gnus-group) 456 :group 'gnus-group)
496;; backward-compatibility alias
497(put 'gnus-group-news-low-face 'face-alias 'gnus-group-news-low)
498(put 'gnus-group-news-low-face 'obsolete-face "22.1")
499 457
500(defface gnus-group-mail-1-empty 458(defface gnus-group-mail-1-empty
501 '((((class color) 459 '((((class color)
@@ -508,17 +466,11 @@ be set in `.emacs' instead."
508 (:italic t))) 466 (:italic t)))
509 "Level 1 empty mailgroup face." 467 "Level 1 empty mailgroup face."
510 :group 'gnus-group) 468 :group 'gnus-group)
511;; backward-compatibility alias
512(put 'gnus-group-mail-1-empty-face 'face-alias 'gnus-group-mail-1-empty)
513(put 'gnus-group-mail-1-empty-face 'obsolete-face "22.1")
514 469
515(defface gnus-group-mail-1 470(defface gnus-group-mail-1
516 '((t (:inherit gnus-group-mail-1-empty :bold t))) 471 '((t (:inherit gnus-group-mail-1-empty :bold t)))
517 "Level 1 mailgroup face." 472 "Level 1 mailgroup face."
518 :group 'gnus-group) 473 :group 'gnus-group)
519;; backward-compatibility alias
520(put 'gnus-group-mail-1-face 'face-alias 'gnus-group-mail-1)
521(put 'gnus-group-mail-1-face 'obsolete-face "22.1")
522 474
523(defface gnus-group-mail-2-empty 475(defface gnus-group-mail-2-empty
524 '((((class color) 476 '((((class color)
@@ -531,17 +483,11 @@ be set in `.emacs' instead."
531 (:italic t))) 483 (:italic t)))
532 "Level 2 empty mailgroup face." 484 "Level 2 empty mailgroup face."
533 :group 'gnus-group) 485 :group 'gnus-group)
534;; backward-compatibility alias
535(put 'gnus-group-mail-2-empty-face 'face-alias 'gnus-group-mail-2-empty)
536(put 'gnus-group-mail-2-empty-face 'obsolete-face "22.1")
537 486
538(defface gnus-group-mail-2 487(defface gnus-group-mail-2
539 '((t (:inherit gnus-group-mail-2-empty :bold t))) 488 '((t (:inherit gnus-group-mail-2-empty :bold t)))
540 "Level 2 mailgroup face." 489 "Level 2 mailgroup face."
541 :group 'gnus-group) 490 :group 'gnus-group)
542;; backward-compatibility alias
543(put 'gnus-group-mail-2-face 'face-alias 'gnus-group-mail-2)
544(put 'gnus-group-mail-2-face 'obsolete-face "22.1")
545 491
546(defface gnus-group-mail-3-empty 492(defface gnus-group-mail-3-empty
547 '((((class color) 493 '((((class color)
@@ -554,17 +500,11 @@ be set in `.emacs' instead."
554 ())) 500 ()))
555 "Level 3 empty mailgroup face." 501 "Level 3 empty mailgroup face."
556 :group 'gnus-group) 502 :group 'gnus-group)
557;; backward-compatibility alias
558(put 'gnus-group-mail-3-empty-face 'face-alias 'gnus-group-mail-3-empty)
559(put 'gnus-group-mail-3-empty-face 'obsolete-face "22.1")
560 503
561(defface gnus-group-mail-3 504(defface gnus-group-mail-3
562 '((t (:inherit gnus-group-mail-3-empty :bold t))) 505 '((t (:inherit gnus-group-mail-3-empty :bold t)))
563 "Level 3 mailgroup face." 506 "Level 3 mailgroup face."
564 :group 'gnus-group) 507 :group 'gnus-group)
565;; backward-compatibility alias
566(put 'gnus-group-mail-3-face 'face-alias 'gnus-group-mail-3)
567(put 'gnus-group-mail-3-face 'obsolete-face "22.1")
568 508
569(defface gnus-group-mail-low-empty 509(defface gnus-group-mail-low-empty
570 '((((class color) 510 '((((class color)
@@ -577,35 +517,23 @@ be set in `.emacs' instead."
577 (:bold t))) 517 (:bold t)))
578 "Low level empty mailgroup face." 518 "Low level empty mailgroup face."
579 :group 'gnus-group) 519 :group 'gnus-group)
580;; backward-compatibility alias
581(put 'gnus-group-mail-low-empty-face 'face-alias 'gnus-group-mail-low-empty)
582(put 'gnus-group-mail-low-empty-face 'obsolete-face "22.1")
583 520
584(defface gnus-group-mail-low 521(defface gnus-group-mail-low
585 '((t (:inherit gnus-group-mail-low-empty :bold t))) 522 '((t (:inherit gnus-group-mail-low-empty :bold t)))
586 "Low level mailgroup face." 523 "Low level mailgroup face."
587 :group 'gnus-group) 524 :group 'gnus-group)
588;; backward-compatibility alias
589(put 'gnus-group-mail-low-face 'face-alias 'gnus-group-mail-low)
590(put 'gnus-group-mail-low-face 'obsolete-face "22.1")
591 525
592;; Summary mode faces. 526;; Summary mode faces.
593 527
594(defface gnus-summary-selected '((t (:underline t))) 528(defface gnus-summary-selected '((t (:underline t)))
595 "Face used for selected articles." 529 "Face used for selected articles."
596 :group 'gnus-summary) 530 :group 'gnus-summary)
597;; backward-compatibility alias
598(put 'gnus-summary-selected-face 'face-alias 'gnus-summary-selected)
599(put 'gnus-summary-selected-face 'obsolete-face "22.1")
600 531
601(defface gnus-summary-cancelled 532(defface gnus-summary-cancelled
602 '((((class color)) 533 '((((class color))
603 (:foreground "yellow" :background "black"))) 534 (:foreground "yellow" :background "black")))
604 "Face used for canceled articles." 535 "Face used for canceled articles."
605 :group 'gnus-summary) 536 :group 'gnus-summary)
606;; backward-compatibility alias
607(put 'gnus-summary-cancelled-face 'face-alias 'gnus-summary-cancelled)
608(put 'gnus-summary-cancelled-face 'obsolete-face "22.1")
609 537
610(defface gnus-summary-normal-ticked 538(defface gnus-summary-normal-ticked
611 '((((class color) 539 '((((class color)
@@ -618,25 +546,16 @@ be set in `.emacs' instead."
618 ())) 546 ()))
619 "Face used for normal interest ticked articles." 547 "Face used for normal interest ticked articles."
620 :group 'gnus-summary) 548 :group 'gnus-summary)
621;; backward-compatibility alias
622(put 'gnus-summary-normal-ticked-face 'face-alias 'gnus-summary-normal-ticked)
623(put 'gnus-summary-normal-ticked-face 'obsolete-face "22.1")
624 549
625(defface gnus-summary-high-ticked 550(defface gnus-summary-high-ticked
626 '((t (:inherit gnus-summary-normal-ticked :bold t))) 551 '((t (:inherit gnus-summary-normal-ticked :bold t)))
627 "Face used for high interest ticked articles." 552 "Face used for high interest ticked articles."
628 :group 'gnus-summary) 553 :group 'gnus-summary)
629;; backward-compatibility alias
630(put 'gnus-summary-high-ticked-face 'face-alias 'gnus-summary-high-ticked)
631(put 'gnus-summary-high-ticked-face 'obsolete-face "22.1")
632 554
633(defface gnus-summary-low-ticked 555(defface gnus-summary-low-ticked
634 '((t (:inherit gnus-summary-normal-ticked :italic t))) 556 '((t (:inherit gnus-summary-normal-ticked :italic t)))
635 "Face used for low interest ticked articles." 557 "Face used for low interest ticked articles."
636 :group 'gnus-summary) 558 :group 'gnus-summary)
637;; backward-compatibility alias
638(put 'gnus-summary-low-ticked-face 'face-alias 'gnus-summary-low-ticked)
639(put 'gnus-summary-low-ticked-face 'obsolete-face "22.1")
640 559
641(defface gnus-summary-normal-ancient 560(defface gnus-summary-normal-ancient
642 '((((class color) 561 '((((class color)
@@ -649,25 +568,16 @@ be set in `.emacs' instead."
649 ())) 568 ()))
650 "Face used for normal interest ancient articles." 569 "Face used for normal interest ancient articles."
651 :group 'gnus-summary) 570 :group 'gnus-summary)
652;; backward-compatibility alias
653(put 'gnus-summary-normal-ancient-face 'face-alias 'gnus-summary-normal-ancient)
654(put 'gnus-summary-normal-ancient-face 'obsolete-face "22.1")
655 571
656(defface gnus-summary-high-ancient 572(defface gnus-summary-high-ancient
657 '((t (:inherit gnus-summary-normal-ancient :bold t))) 573 '((t (:inherit gnus-summary-normal-ancient :bold t)))
658 "Face used for high interest ancient articles." 574 "Face used for high interest ancient articles."
659 :group 'gnus-summary) 575 :group 'gnus-summary)
660;; backward-compatibility alias
661(put 'gnus-summary-high-ancient-face 'face-alias 'gnus-summary-high-ancient)
662(put 'gnus-summary-high-ancient-face 'obsolete-face "22.1")
663 576
664(defface gnus-summary-low-ancient 577(defface gnus-summary-low-ancient
665 '((t (:inherit gnus-summary-normal-ancient :italic t))) 578 '((t (:inherit gnus-summary-normal-ancient :italic t)))
666 "Face used for low interest ancient articles." 579 "Face used for low interest ancient articles."
667 :group 'gnus-summary) 580 :group 'gnus-summary)
668;; backward-compatibility alias
669(put 'gnus-summary-low-ancient-face 'face-alias 'gnus-summary-low-ancient)
670(put 'gnus-summary-low-ancient-face 'obsolete-face "22.1")
671 581
672(defface gnus-summary-normal-undownloaded 582(defface gnus-summary-normal-undownloaded
673 '((((class color) 583 '((((class color)
@@ -678,50 +588,32 @@ be set in `.emacs' instead."
678 (t (:inverse-video t))) 588 (t (:inverse-video t)))
679 "Face used for normal interest uncached articles." 589 "Face used for normal interest uncached articles."
680 :group 'gnus-summary) 590 :group 'gnus-summary)
681;; backward-compatibility alias
682(put 'gnus-summary-normal-undownloaded-face 'face-alias 'gnus-summary-normal-undownloaded)
683(put 'gnus-summary-normal-undownloaded-face 'obsolete-face "22.1")
684 591
685(defface gnus-summary-high-undownloaded 592(defface gnus-summary-high-undownloaded
686 '((t (:inherit gnus-summary-normal-undownloaded :bold t))) 593 '((t (:inherit gnus-summary-normal-undownloaded :bold t)))
687 "Face used for high interest uncached articles." 594 "Face used for high interest uncached articles."
688 :group 'gnus-summary) 595 :group 'gnus-summary)
689;; backward-compatibility alias
690(put 'gnus-summary-high-undownloaded-face 'face-alias 'gnus-summary-high-undownloaded)
691(put 'gnus-summary-high-undownloaded-face 'obsolete-face "22.1")
692 596
693(defface gnus-summary-low-undownloaded 597(defface gnus-summary-low-undownloaded
694 '((t (:inherit gnus-summary-normal-undownloaded :italic t))) 598 '((t (:inherit gnus-summary-normal-undownloaded :italic t)))
695 "Face used for low interest uncached articles." 599 "Face used for low interest uncached articles."
696 :group 'gnus-summary) 600 :group 'gnus-summary)
697;; backward-compatibility alias
698(put 'gnus-summary-low-undownloaded-face 'face-alias 'gnus-summary-low-undownloaded)
699(put 'gnus-summary-low-undownloaded-face 'obsolete-face "22.1")
700 601
701(defface gnus-summary-normal-unread 602(defface gnus-summary-normal-unread
702 '((t 603 '((t
703 ())) 604 ()))
704 "Face used for normal interest unread articles." 605 "Face used for normal interest unread articles."
705 :group 'gnus-summary) 606 :group 'gnus-summary)
706;; backward-compatibility alias
707(put 'gnus-summary-normal-unread-face 'face-alias 'gnus-summary-normal-unread)
708(put 'gnus-summary-normal-unread-face 'obsolete-face "22.1")
709 607
710(defface gnus-summary-high-unread 608(defface gnus-summary-high-unread
711 '((t (:inherit gnus-summary-normal-unread :bold t))) 609 '((t (:inherit gnus-summary-normal-unread :bold t)))
712 "Face used for high interest unread articles." 610 "Face used for high interest unread articles."
713 :group 'gnus-summary) 611 :group 'gnus-summary)
714;; backward-compatibility alias
715(put 'gnus-summary-high-unread-face 'face-alias 'gnus-summary-high-unread)
716(put 'gnus-summary-high-unread-face 'obsolete-face "22.1")
717 612
718(defface gnus-summary-low-unread 613(defface gnus-summary-low-unread
719 '((t (:inherit gnus-summary-normal-unread :italic t))) 614 '((t (:inherit gnus-summary-normal-unread :italic t)))
720 "Face used for low interest unread articles." 615 "Face used for low interest unread articles."
721 :group 'gnus-summary) 616 :group 'gnus-summary)
722;; backward-compatibility alias
723(put 'gnus-summary-low-unread-face 'face-alias 'gnus-summary-low-unread)
724(put 'gnus-summary-low-unread-face 'obsolete-face "22.1")
725 617
726(defface gnus-summary-normal-read 618(defface gnus-summary-normal-read
727 '((((class color) 619 '((((class color)
@@ -734,25 +626,16 @@ be set in `.emacs' instead."
734 ())) 626 ()))
735 "Face used for normal interest read articles." 627 "Face used for normal interest read articles."
736 :group 'gnus-summary) 628 :group 'gnus-summary)
737;; backward-compatibility alias
738(put 'gnus-summary-normal-read-face 'face-alias 'gnus-summary-normal-read)
739(put 'gnus-summary-normal-read-face 'obsolete-face "22.1")
740 629
741(defface gnus-summary-high-read 630(defface gnus-summary-high-read
742 '((t (:inherit gnus-summary-normal-read :bold t))) 631 '((t (:inherit gnus-summary-normal-read :bold t)))
743 "Face used for high interest read articles." 632 "Face used for high interest read articles."
744 :group 'gnus-summary) 633 :group 'gnus-summary)
745;; backward-compatibility alias
746(put 'gnus-summary-high-read-face 'face-alias 'gnus-summary-high-read)
747(put 'gnus-summary-high-read-face 'obsolete-face "22.1")
748 634
749(defface gnus-summary-low-read 635(defface gnus-summary-low-read
750 '((t (:inherit gnus-summary-normal-read :italic t))) 636 '((t (:inherit gnus-summary-normal-read :italic t)))
751 "Face used for low interest read articles." 637 "Face used for low interest read articles."
752 :group 'gnus-summary) 638 :group 'gnus-summary)
753;; backward-compatibility alias
754(put 'gnus-summary-low-read-face 'face-alias 'gnus-summary-low-read)
755(put 'gnus-summary-low-read-face 'obsolete-face "22.1")
756 639
757 640
758;;; 641;;;
@@ -812,9 +695,6 @@ be set in `.emacs' instead."
812 ())) 695 ()))
813 "Face for the splash screen." 696 "Face for the splash screen."
814 :group 'gnus-start) 697 :group 'gnus-start)
815;; backward-compatibility alias
816(put 'gnus-splash-face 'face-alias 'gnus-splash)
817(put 'gnus-splash-face 'obsolete-face "22.1")
818 698
819(defun gnus-splash () 699(defun gnus-splash ()
820 (save-excursion 700 (save-excursion
diff --git a/lisp/gnus/spam.el b/lisp/gnus/spam.el
index f2024a339b0..de8aa77efc9 100644
--- a/lisp/gnus/spam.el
+++ b/lisp/gnus/spam.el
@@ -366,9 +366,6 @@ Only meaningful if you enable `spam-use-blackholes'."
366 (t :inverse-video t)) 366 (t :inverse-video t))
367 "Face for spam-marked articles." 367 "Face for spam-marked articles."
368 :group 'spam) 368 :group 'spam)
369;; backward-compatibility alias
370(put 'spam-face 'face-alias 'spam)
371(put 'spam-face 'obsolete-face "22.1")
372 369
373(defcustom spam-face 'spam 370(defcustom spam-face 'spam
374 "Face for spam-marked articles." 371 "Face for spam-marked articles."