From: Miles Bader Date: Thu, 16 Jun 2005 05:51:57 +0000 (+0000) Subject: Revision: miles@gnu.org--gnu-2005/gnus--devo--0--patch-138 X-Git-Url: http://cgit.sxemacs.org/?p=gnus;a=commitdiff_plain;h=a998d0db25b138c891ab8f7e1a059e26caa973a6;hp=f8f74b149ee73d9f27ea87c3a88362cd72828102 Revision: miles@gnu.org--gnu-2005/gnus--devo--0--patch-138 Merge from gnus--rel--5.10 Patches applied: * emacs--cvs-trunk--0 (patch 406-407, 425) - Merge from gnus--rel--5.10 - Update from CVS - Remove "-face" suffix from gnus faces * gnus--rel--5.10 (patch 83) - Merge from emacs--cvs-trunk--0 2005-06-16 Miles Bader * lisp/spam.el (spam): Remove "-face" suffix from face name. (spam-face): New backward-compatibility alias for renamed face. (spam-face, spam-initialize): Use renamed spam face. * lisp/message.el (message-header-to, message-header-cc) (message-header-subject, message-header-newsgroups) (message-header-other, message-header-name) (message-header-xheader, message-separator, message-cited-text) (message-mml): Remove "-face" suffix from face names. (message-header-to-face, message-header-cc-face) (message-header-subject-face, message-header-newsgroups-face) (message-header-other-face, message-header-name-face) (message-header-xheader-face, message-separator-face) (message-cited-text-face, message-mml-face): New backward-compatibility aliases for renamed faces. (message-font-lock-keywords): Use renamed message faces. * lisp/sieve-mode.el (sieve-control-commands, sieve-action-commands) (sieve-test-commands, sieve-tagged-arguments): Remove "-face" suffix from face names. (sieve-control-commands-face, sieve-action-commands-face) (sieve-test-commands-face, sieve-tagged-arguments-face): New backward-compatibility aliases for renamed faces. (sieve-control-commands-face, sieve-action-commands-face) (sieve-test-commands-face, sieve-tagged-arguments-face): Use renamed sieve faces. * lisp/gnus.el (gnus-group-news-1, gnus-group-news-1-empty) (gnus-group-news-2, gnus-group-news-2-empty, gnus-group-news-3) (gnus-group-news-3-empty, gnus-group-news-4) (gnus-group-news-4-empty, gnus-group-news-5) (gnus-group-news-5-empty, gnus-group-news-6) (gnus-group-news-6-empty, gnus-group-news-low) (gnus-group-news-low-empty, gnus-group-mail-1) (gnus-group-mail-1-empty, gnus-group-mail-2) (gnus-group-mail-2-empty, gnus-group-mail-3) (gnus-group-mail-3-empty, gnus-group-mail-low) (gnus-group-mail-low-empty, gnus-summary-selected) (gnus-summary-cancelled, gnus-summary-high-ticked) (gnus-summary-low-ticked, gnus-summary-normal-ticked) (gnus-summary-high-ancient, gnus-summary-low-ancient) (gnus-summary-normal-ancient, gnus-summary-high-undownloaded) (gnus-summary-low-undownloaded) (gnus-summary-normal-undownloaded, gnus-summary-high-unread) (gnus-summary-low-unread, gnus-summary-normal-unread) (gnus-summary-high-read, gnus-summary-low-read) (gnus-summary-normal-read, gnus-splash): Remove "-face" suffix from face names. (gnus-group-news-1-face, gnus-group-news-1-empty-face) (gnus-group-news-2-face, gnus-group-news-2-empty-face) (gnus-group-news-3-face, gnus-group-news-3-empty-face) (gnus-group-news-4-face, gnus-group-news-4-empty-face) (gnus-group-news-5-face, gnus-group-news-5-empty-face) (gnus-group-news-6-face, gnus-group-news-6-empty-face) (gnus-group-news-low-face, gnus-group-news-low-empty-face) (gnus-group-mail-1-face, gnus-group-mail-1-empty-face) (gnus-group-mail-2-face, gnus-group-mail-2-empty-face) (gnus-group-mail-3-face, gnus-group-mail-3-empty-face) (gnus-group-mail-low-face, gnus-group-mail-low-empty-face) (gnus-summary-selected-face, gnus-summary-cancelled-face) (gnus-summary-high-ticked-face, gnus-summary-low-ticked-face) (gnus-summary-normal-ticked-face) (gnus-summary-high-ancient-face, gnus-summary-low-ancient-face) (gnus-summary-normal-ancient-face) (gnus-summary-high-undownloaded-face) (gnus-summary-low-undownloaded-face) (gnus-summary-normal-undownloaded-face) (gnus-summary-high-unread-face, gnus-summary-low-unread-face) (gnus-summary-normal-unread-face, gnus-summary-high-read-face) (gnus-summary-low-read-face, gnus-summary-normal-read-face) (gnus-splash-face): New backward-compatibility aliases for renamed faces. (gnus-group-startup-message): Use renamed gnus faces. * lisp/gnus-srvr.el (gnus-server-agent, gnus-server-opened) (gnus-server-closed, gnus-server-denied, gnus-server-offline) (gnus-server-agent): Remove "-face" suffix from face names. (gnus-server-agent-face, gnus-server-opened-face) (gnus-server-closed-face, gnus-server-denied-face) (gnus-server-offline-face): New backward-compatibility aliases for renamed faces. (gnus-server-agent-face, gnus-server-opened-face) (gnus-server-closed-face, gnus-server-denied-face) (gnus-server-offline-face): Use renamed gnus faces. * lisp/gnus-picon.el (gnus-picon-xbm, gnus-picon): Remove "-face" suffix from face names. (gnus-picon-xbm-face, gnus-picon-face): New backward-compatibility aliases for renamed faces. * lisp/gnus-cite.el (gnus-cite-attribution, gnus-cite-1, gnus-cite-2) (gnus-cite-3, gnus-cite-4, gnus-cite-5, gnus-cite-6) (gnus-cite-7, gnus-cite-8, gnus-cite-9, gnus-cite-10) (gnus-cite-11): Remove "-face" suffix from face names. (gnus-cite-attribution-face, gnus-cite-face-1, gnus-cite-face-2) (gnus-cite-face-3, gnus-cite-face-4, gnus-cite-face-5) (gnus-cite-face-6, gnus-cite-face-7, gnus-cite-face-8) (gnus-cite-face-9, gnus-cite-face-10, gnus-cite-face-11): New backward-compatibility aliases for renamed faces. (gnus-cite-attribution-face, gnus-cite-face-list) (gnus-article-boring-faces): Use renamed gnus faces. * lisp/gnus-art.el (gnus-signature, gnus-header-from) (gnus-header-subject, gnus-header-newsgroups, gnus-header-name) (gnus-header-content): Remove "-face" suffix from face names. (gnus-signature-face, gnus-header-from-face) (gnus-header-subject-face, gnus-header-newsgroups-face) (gnus-header-name-face, gnus-header-content-face): New backward-compatibility aliases for renamed faces. (gnus-signature-face, gnus-header-face-alist): Use renamed gnus faces. * lisp/gnus-sum.el (gnus-summary-selected-face) (gnus-summary-highlight): Use renamed gnus faces. * lisp/gnus-group.el (gnus-group-highlight): Likewise. 2005-06-14 Juanma Barranquero * lisp/gnus-sieve.el (gnus-sieve-article-add-rule): * lisp/legacy-gnus-agent.el (gnus-agent-unlist-expire-days): * lisp/spam-stat.el (spam-stat-buffer-change-to-spam) (spam-stat-buffer-change-to-non-spam): Follow error conventions. * lisp/message.el (message-is-yours-p): * lisp/gnus-sum.el (gnus-auto-select-subject): Fix quoting in docstring. --- diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 6dbb0bbf9..ef4568e87 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,130 @@ +2005-06-16 Miles Bader + + * spam.el (spam): Remove "-face" suffix from face name. + (spam-face): New backward-compatibility alias for renamed face. + (spam-face, spam-initialize): Use renamed spam face. + + * message.el (message-header-to, message-header-cc) + (message-header-subject, message-header-newsgroups) + (message-header-other, message-header-name) + (message-header-xheader, message-separator, message-cited-text) + (message-mml): Remove "-face" suffix from face names. + (message-header-to-face, message-header-cc-face) + (message-header-subject-face, message-header-newsgroups-face) + (message-header-other-face, message-header-name-face) + (message-header-xheader-face, message-separator-face) + (message-cited-text-face, message-mml-face): + New backward-compatibility aliases for renamed faces. + (message-font-lock-keywords): Use renamed message faces. + + * sieve-mode.el (sieve-control-commands, sieve-action-commands) + (sieve-test-commands, sieve-tagged-arguments): + Remove "-face" suffix from face names. + (sieve-control-commands-face, sieve-action-commands-face) + (sieve-test-commands-face, sieve-tagged-arguments-face): + New backward-compatibility aliases for renamed faces. + (sieve-control-commands-face, sieve-action-commands-face) + (sieve-test-commands-face, sieve-tagged-arguments-face): + Use renamed sieve faces. + + * gnus.el (gnus-group-news-1, gnus-group-news-1-empty) + (gnus-group-news-2, gnus-group-news-2-empty, gnus-group-news-3) + (gnus-group-news-3-empty, gnus-group-news-4) + (gnus-group-news-4-empty, gnus-group-news-5) + (gnus-group-news-5-empty, gnus-group-news-6) + (gnus-group-news-6-empty, gnus-group-news-low) + (gnus-group-news-low-empty, gnus-group-mail-1) + (gnus-group-mail-1-empty, gnus-group-mail-2) + (gnus-group-mail-2-empty, gnus-group-mail-3) + (gnus-group-mail-3-empty, gnus-group-mail-low) + (gnus-group-mail-low-empty, gnus-summary-selected) + (gnus-summary-cancelled, gnus-summary-high-ticked) + (gnus-summary-low-ticked, gnus-summary-normal-ticked) + (gnus-summary-high-ancient, gnus-summary-low-ancient) + (gnus-summary-normal-ancient, gnus-summary-high-undownloaded) + (gnus-summary-low-undownloaded) + (gnus-summary-normal-undownloaded, gnus-summary-high-unread) + (gnus-summary-low-unread, gnus-summary-normal-unread) + (gnus-summary-high-read, gnus-summary-low-read) + (gnus-summary-normal-read, gnus-splash): + Remove "-face" suffix from face names. + (gnus-group-news-1-face, gnus-group-news-1-empty-face) + (gnus-group-news-2-face, gnus-group-news-2-empty-face) + (gnus-group-news-3-face, gnus-group-news-3-empty-face) + (gnus-group-news-4-face, gnus-group-news-4-empty-face) + (gnus-group-news-5-face, gnus-group-news-5-empty-face) + (gnus-group-news-6-face, gnus-group-news-6-empty-face) + (gnus-group-news-low-face, gnus-group-news-low-empty-face) + (gnus-group-mail-1-face, gnus-group-mail-1-empty-face) + (gnus-group-mail-2-face, gnus-group-mail-2-empty-face) + (gnus-group-mail-3-face, gnus-group-mail-3-empty-face) + (gnus-group-mail-low-face, gnus-group-mail-low-empty-face) + (gnus-summary-selected-face, gnus-summary-cancelled-face) + (gnus-summary-high-ticked-face, gnus-summary-low-ticked-face) + (gnus-summary-normal-ticked-face) + (gnus-summary-high-ancient-face, gnus-summary-low-ancient-face) + (gnus-summary-normal-ancient-face) + (gnus-summary-high-undownloaded-face) + (gnus-summary-low-undownloaded-face) + (gnus-summary-normal-undownloaded-face) + (gnus-summary-high-unread-face, gnus-summary-low-unread-face) + (gnus-summary-normal-unread-face, gnus-summary-high-read-face) + (gnus-summary-low-read-face, gnus-summary-normal-read-face) + (gnus-splash-face): + New backward-compatibility aliases for renamed faces. + (gnus-group-startup-message): Use renamed gnus faces. + + * gnus-srvr.el (gnus-server-agent, gnus-server-opened) + (gnus-server-closed, gnus-server-denied, gnus-server-offline) + (gnus-server-agent): Remove "-face" suffix from face names. + (gnus-server-agent-face, gnus-server-opened-face) + (gnus-server-closed-face, gnus-server-denied-face) + (gnus-server-offline-face): + New backward-compatibility aliases for renamed faces. + (gnus-server-agent-face, gnus-server-opened-face) + (gnus-server-closed-face, gnus-server-denied-face) + (gnus-server-offline-face): Use renamed gnus faces. + + * gnus-picon.el (gnus-picon-xbm, gnus-picon): + Remove "-face" suffix from face names. + (gnus-picon-xbm-face, gnus-picon-face): + New backward-compatibility aliases for renamed faces. + + * gnus-cite.el (gnus-cite-attribution, gnus-cite-1, gnus-cite-2) + (gnus-cite-3, gnus-cite-4, gnus-cite-5, gnus-cite-6) + (gnus-cite-7, gnus-cite-8, gnus-cite-9, gnus-cite-10) + (gnus-cite-11): Remove "-face" suffix from face names. + (gnus-cite-attribution-face, gnus-cite-face-1, gnus-cite-face-2) + (gnus-cite-face-3, gnus-cite-face-4, gnus-cite-face-5) + (gnus-cite-face-6, gnus-cite-face-7, gnus-cite-face-8) + (gnus-cite-face-9, gnus-cite-face-10, gnus-cite-face-11): + New backward-compatibility aliases for renamed faces. + (gnus-cite-attribution-face, gnus-cite-face-list) + (gnus-article-boring-faces): Use renamed gnus faces. + + * gnus-art.el (gnus-signature, gnus-header-from) + (gnus-header-subject, gnus-header-newsgroups, gnus-header-name) + (gnus-header-content): Remove "-face" suffix from face names. + (gnus-signature-face, gnus-header-from-face) + (gnus-header-subject-face, gnus-header-newsgroups-face) + (gnus-header-name-face, gnus-header-content-face): + New backward-compatibility aliases for renamed faces. + (gnus-signature-face, gnus-header-face-alist): Use renamed gnus faces. + + * gnus-sum.el (gnus-summary-selected-face) + (gnus-summary-highlight): Use renamed gnus faces. + * gnus-group.el (gnus-group-highlight): Likewise. + +2005-06-14 Juanma Barranquero + + * gnus-sieve.el (gnus-sieve-article-add-rule): + * legacy-gnus-agent.el (gnus-agent-unlist-expire-days): + * spam-stat.el (spam-stat-buffer-change-to-spam) + (spam-stat-buffer-change-to-non-spam): Follow error conventions. + + * message.el (message-is-yours-p): + * gnus-sum.el (gnus-auto-select-subject): Fix quoting in docstring. + 2005-06-14 Katsumi Yamaoka * mm-view.el (mm-inline-text): Withdraw the last change. @@ -3874,7 +4001,7 @@ (gnus-cache-delete-group-total-fetched-for): New function. (gnus-cache-total-fetched-for): New function. - * gnus-group.el (): Require gnus-sum and autoload functions to + * gnus-group.el: Require gnus-sum and autoload functions to resolve warnings when gnus-group.el compiled alone. (gnus-group-line-format): Documented new %F (size of Fetched data) group line format; identifies disk space diff --git a/lisp/gnus-art.el b/lisp/gnus-art.el index 7896898e8..e6e5032de 100644 --- a/lisp/gnus-art.el +++ b/lisp/gnus-art.el @@ -660,21 +660,23 @@ above them." :type 'face :group 'gnus-article-buttons) -(defcustom gnus-signature-face 'gnus-signature-face +(defcustom gnus-signature-face 'gnus-signature "Face used for highlighting a signature in the article buffer. -Obsolete; use the face `gnus-signature-face' for customizations instead." +Obsolete; use the face `gnus-signature' for customizations instead." :type 'face :group 'gnus-article-highlight :group 'gnus-article-signature) -(defface gnus-signature-face +(defface gnus-signature '((t (:italic t))) "Face used for highlighting a signature in the article buffer." :group 'gnus-article-highlight :group 'gnus-article-signature) +;; backward-compatibility alias +(put 'gnus-signature-face 'face-alias 'gnus-signature) -(defface gnus-header-from-face +(defface gnus-header-from '((((class color) (background dark)) (:foreground "spring green")) @@ -686,8 +688,10 @@ Obsolete; use the face `gnus-signature-face' for customizations instead." "Face used for displaying from headers." :group 'gnus-article-headers :group 'gnus-article-highlight) +;; backward-compatibility alias +(put 'gnus-header-from-face 'face-alias 'gnus-header-from) -(defface gnus-header-subject-face +(defface gnus-header-subject '((((class color) (background dark)) (:foreground "SeaGreen3")) @@ -699,8 +703,10 @@ Obsolete; use the face `gnus-signature-face' for customizations instead." "Face used for displaying subject headers." :group 'gnus-article-headers :group 'gnus-article-highlight) +;; backward-compatibility alias +(put 'gnus-header-subject-face 'face-alias 'gnus-header-subject) -(defface gnus-header-newsgroups-face +(defface gnus-header-newsgroups '((((class color) (background dark)) (:foreground "yellow" :italic t)) @@ -714,8 +720,10 @@ In the default setup this face is only used for crossposted articles." :group 'gnus-article-headers :group 'gnus-article-highlight) +;; backward-compatibility alias +(put 'gnus-header-newsgroups-face 'face-alias 'gnus-header-newsgroups) -(defface gnus-header-name-face +(defface gnus-header-name '((((class color) (background dark)) (:foreground "SeaGreen")) @@ -727,8 +735,10 @@ articles." "Face used for displaying header names." :group 'gnus-article-headers :group 'gnus-article-highlight) +;; backward-compatibility alias +(put 'gnus-header-name-face 'face-alias 'gnus-header-name) -(defface gnus-header-content-face +(defface gnus-header-content '((((class color) (background dark)) (:foreground "forest green" :italic t)) @@ -739,12 +749,14 @@ articles." (:italic t))) "Face used for displaying header content." :group 'gnus-article-headers :group 'gnus-article-highlight) +;; backward-compatibility alias +(put 'gnus-header-content-face 'face-alias 'gnus-header-content) (defcustom gnus-header-face-alist - '(("From" nil gnus-header-from-face) - ("Subject" nil gnus-header-subject-face) - ("Newsgroups:.*," nil gnus-header-newsgroups-face) - ("" gnus-header-name-face gnus-header-content-face)) + '(("From" nil gnus-header-from) + ("Subject" nil gnus-header-subject) + ("Newsgroups:.*," nil gnus-header-newsgroups) + ("" gnus-header-name gnus-header-content)) "*Controls highlighting of article headers. An alist of the form (HEADER NAME CONTENT). @@ -6479,7 +6491,7 @@ do the highlighting. See the documentation for those functions." (defun gnus-article-highlight-signature () "Highlight the signature in an article. It does this by highlighting everything after -`gnus-signature-separator' using `gnus-signature-face'." +`gnus-signature-separator' using the face `gnus-signature'." (interactive) (gnus-with-article-buffer (let ((inhibit-point-motion-hooks t)) diff --git a/lisp/gnus-cite.el b/lisp/gnus-cite.el index 90f1b28d1..260bb685e 100644 --- a/lisp/gnus-cite.el +++ b/lisp/gnus-cite.el @@ -137,143 +137,165 @@ the envelope From line." :group 'gnus-cite :type 'boolean) -(defface gnus-cite-attribution-face '((t - (:italic t))) +(defface gnus-cite-attribution '((t (:italic t))) "Face used for attribution lines." :group 'gnus-cite) +;; backward-compatibility alias +(put 'gnus-cite-attribution-face 'face-alias 'gnus-cite-attribution) -(defcustom gnus-cite-attribution-face 'gnus-cite-attribution-face +(defcustom gnus-cite-attribution-face 'gnus-cite-attribution "Face used for attribution lines. It is merged with the face for the cited text belonging to the attribution." :version "22.1" :group 'gnus-cite :type 'face) -(defface gnus-cite-face-1 '((((class color) - (background dark)) - (:foreground "light blue")) - (((class color) - (background light)) - (:foreground "MidnightBlue")) - (t - (:italic t))) +(defface gnus-cite-1 '((((class color) + (background dark)) + (:foreground "light blue")) + (((class color) + (background light)) + (:foreground "MidnightBlue")) + (t + (:italic t))) "Citation face." :group 'gnus-cite) - -(defface gnus-cite-face-2 '((((class color) - (background dark)) - (:foreground "light cyan")) - (((class color) - (background light)) - (:foreground "firebrick")) - (t - (:italic t))) +;; backward-compatibility alias +(put 'gnus-cite-face-1 'face-alias 'gnus-cite-1) + +(defface gnus-cite-2 '((((class color) + (background dark)) + (:foreground "light cyan")) + (((class color) + (background light)) + (:foreground "firebrick")) + (t + (:italic t))) "Citation face." :group 'gnus-cite) - -(defface gnus-cite-face-3 '((((class color) - (background dark)) - (:foreground "light yellow")) - (((class color) - (background light)) - (:foreground "dark green")) - (t - (:italic t))) +;; backward-compatibility alias +(put 'gnus-cite-face-2 'face-alias 'gnus-cite-2) + +(defface gnus-cite-3 '((((class color) + (background dark)) + (:foreground "light yellow")) + (((class color) + (background light)) + (:foreground "dark green")) + (t + (:italic t))) "Citation face." :group 'gnus-cite) - -(defface gnus-cite-face-4 '((((class color) - (background dark)) - (:foreground "light pink")) - (((class color) - (background light)) - (:foreground "OrangeRed")) - (t - (:italic t))) +;; backward-compatibility alias +(put 'gnus-cite-face-3 'face-alias 'gnus-cite-3) + +(defface gnus-cite-4 '((((class color) + (background dark)) + (:foreground "light pink")) + (((class color) + (background light)) + (:foreground "OrangeRed")) + (t + (:italic t))) "Citation face." :group 'gnus-cite) - -(defface gnus-cite-face-5 '((((class color) - (background dark)) - (:foreground "pale green")) - (((class color) - (background light)) - (:foreground "dark khaki")) - (t - (:italic t))) +;; backward-compatibility alias +(put 'gnus-cite-face-4 'face-alias 'gnus-cite-4) + +(defface gnus-cite-5 '((((class color) + (background dark)) + (:foreground "pale green")) + (((class color) + (background light)) + (:foreground "dark khaki")) + (t + (:italic t))) "Citation face." :group 'gnus-cite) - -(defface gnus-cite-face-6 '((((class color) - (background dark)) - (:foreground "beige")) - (((class color) - (background light)) - (:foreground "dark violet")) - (t - (:italic t))) +;; backward-compatibility alias +(put 'gnus-cite-face-5 'face-alias 'gnus-cite-5) + +(defface gnus-cite-6 '((((class color) + (background dark)) + (:foreground "beige")) + (((class color) + (background light)) + (:foreground "dark violet")) + (t + (:italic t))) "Citation face." :group 'gnus-cite) - -(defface gnus-cite-face-7 '((((class color) - (background dark)) - (:foreground "orange")) - (((class color) - (background light)) - (:foreground "SteelBlue4")) - (t - (:italic t))) +;; backward-compatibility alias +(put 'gnus-cite-face-6 'face-alias 'gnus-cite-6) + +(defface gnus-cite-7 '((((class color) + (background dark)) + (:foreground "orange")) + (((class color) + (background light)) + (:foreground "SteelBlue4")) + (t + (:italic t))) "Citation face." :group 'gnus-cite) - -(defface gnus-cite-face-8 '((((class color) - (background dark)) - (:foreground "magenta")) - (((class color) - (background light)) - (:foreground "magenta")) - (t - (:italic t))) +;; backward-compatibility alias +(put 'gnus-cite-face-7 'face-alias 'gnus-cite-7) + +(defface gnus-cite-8 '((((class color) + (background dark)) + (:foreground "magenta")) + (((class color) + (background light)) + (:foreground "magenta")) + (t + (:italic t))) "Citation face." :group 'gnus-cite) - -(defface gnus-cite-face-9 '((((class color) - (background dark)) - (:foreground "violet")) - (((class color) - (background light)) - (:foreground "violet")) - (t - (:italic t))) +;; backward-compatibility alias +(put 'gnus-cite-face-8 'face-alias 'gnus-cite-8) + +(defface gnus-cite-9 '((((class color) + (background dark)) + (:foreground "violet")) + (((class color) + (background light)) + (:foreground "violet")) + (t + (:italic t))) "Citation face." :group 'gnus-cite) - -(defface gnus-cite-face-10 '((((class color) - (background dark)) - (:foreground "medium purple")) - (((class color) - (background light)) - (:foreground "medium purple")) - (t - (:italic t))) +;; backward-compatibility alias +(put 'gnus-cite-face-9 'face-alias 'gnus-cite-9) + +(defface gnus-cite-10 '((((class color) + (background dark)) + (:foreground "medium purple")) + (((class color) + (background light)) + (:foreground "medium purple")) + (t + (:italic t))) "Citation face." :group 'gnus-cite) - -(defface gnus-cite-face-11 '((((class color) - (background dark)) - (:foreground "turquoise")) - (((class color) - (background light)) - (:foreground "turquoise")) - (t - (:italic t))) +;; backward-compatibility alias +(put 'gnus-cite-face-10 'face-alias 'gnus-cite-10) + +(defface gnus-cite-11 '((((class color) + (background dark)) + (:foreground "turquoise")) + (((class color) + (background light)) + (:foreground "turquoise")) + (t + (:italic t))) "Citation face." :group 'gnus-cite) +;; backward-compatibility alias +(put 'gnus-cite-face-11 'face-alias 'gnus-cite-11) (defcustom gnus-cite-face-list - '(gnus-cite-face-1 gnus-cite-face-2 gnus-cite-face-3 gnus-cite-face-4 - gnus-cite-face-5 gnus-cite-face-6 gnus-cite-face-7 gnus-cite-face-8 - gnus-cite-face-9 gnus-cite-face-10 gnus-cite-face-11) + '(gnus-cite-1 gnus-cite-2 gnus-cite-3 gnus-cite-4 gnus-cite-5 gnus-cite-6 + gnus-cite-7 gnus-cite-8 gnus-cite-9 gnus-cite-10 gnus-cite-11) "*List of faces used for highlighting citations. When there are citations from multiple articles in the same message, @@ -299,8 +321,7 @@ This should make it easier to see who wrote what." ;; This has to go here because its default value depends on ;; gnus-cite-face-list. -(defcustom gnus-article-boring-faces (cons 'gnus-signature-face - gnus-cite-face-list) +(defcustom gnus-article-boring-faces (cons 'gnus-signature gnus-cite-face-list) "List of faces that are not worth reading. If an article has more pages below the one you are looking at, but nothing on those pages is a word of at least three letters that is not @@ -352,7 +373,7 @@ in a boring face, then the pages will be skipped." Each citation in the article will be highlighted with a different face. The faces are taken from `gnus-cite-face-list'. Attribution lines are highlighted with the same face as the -corresponding citation merged with `gnus-cite-attribution-face'. +corresponding citation merged with the face `gnus-cite-attribution'. Text is considered cited if at least `gnus-cite-minimum-match-count' lines matches `message-cite-prefix-regexp' with the same prefix. diff --git a/lisp/gnus-group.el b/lisp/gnus-group.el index ab674907e..5d00256e9 100644 --- a/lisp/gnus-group.el +++ b/lisp/gnus-group.el @@ -313,50 +313,50 @@ variable." (defcustom gnus-group-highlight '(;; Mail. ((and mailp (= unread 0) (eq level 1)) . - gnus-group-mail-1-empty-face) + gnus-group-mail-1-empty) ((and mailp (eq level 1)) . - gnus-group-mail-1-face) + gnus-group-mail-1) ((and mailp (= unread 0) (eq level 2)) . - gnus-group-mail-2-empty-face) + gnus-group-mail-2-empty) ((and mailp (eq level 2)) . - gnus-group-mail-2-face) + gnus-group-mail-2) ((and mailp (= unread 0) (eq level 3)) . - gnus-group-mail-3-empty-face) + gnus-group-mail-3-empty) ((and mailp (eq level 3)) . - gnus-group-mail-3-face) + gnus-group-mail-3) ((and mailp (= unread 0)) . - gnus-group-mail-low-empty-face) + gnus-group-mail-low-empty) ((and mailp) . - gnus-group-mail-low-face) + gnus-group-mail-low) ;; News. ((and (= unread 0) (eq level 1)) . - gnus-group-news-1-empty-face) + gnus-group-news-1-empty) ((and (eq level 1)) . - gnus-group-news-1-face) + gnus-group-news-1) ((and (= unread 0) (eq level 2)) . - gnus-group-news-2-empty-face) + gnus-group-news-2-empty) ((and (eq level 2)) . - gnus-group-news-2-face) + gnus-group-news-2) ((and (= unread 0) (eq level 3)) . - gnus-group-news-3-empty-face) + gnus-group-news-3-empty) ((and (eq level 3)) . - gnus-group-news-3-face) + gnus-group-news-3) ((and (= unread 0) (eq level 4)) . - gnus-group-news-4-empty-face) + gnus-group-news-4-empty) ((and (eq level 4)) . - gnus-group-news-4-face) + gnus-group-news-4) ((and (= unread 0) (eq level 5)) . - gnus-group-news-5-empty-face) + gnus-group-news-5-empty) ((and (eq level 5)) . - gnus-group-news-5-face) + gnus-group-news-5) ((and (= unread 0) (eq level 6)) . - gnus-group-news-6-empty-face) + gnus-group-news-6-empty) ((and (eq level 6)) . - gnus-group-news-6-face) + gnus-group-news-6) ((and (= unread 0)) . - gnus-group-news-low-empty-face) + gnus-group-news-low-empty) (t . - gnus-group-news-low-face)) + gnus-group-news-low)) "*Controls the highlighting of group buffer lines. Below is a list of `Form'/`Face' pairs. When deciding how a a diff --git a/lisp/gnus-picon.el b/lisp/gnus-picon.el index ef75a1750..5d7901816 100644 --- a/lisp/gnus-picon.el +++ b/lisp/gnus-picon.el @@ -1,6 +1,6 @@ ;;; gnus-picon.el --- displaying pretty icons in Gnus -;; Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004 +;; Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005 ;; Free Software Foundation, Inc. ;; Author: Lars Magne Ingebrigtsen @@ -83,13 +83,17 @@ added right to the textual representation." (const right)) :group 'gnus-picon) -(defface gnus-picon-xbm-face '((t (:foreground "black" :background "white"))) +(defface gnus-picon-xbm '((t (:foreground "black" :background "white"))) "Face to show xbm picon in." :group 'gnus-picon) +;; backward-compatibility alias +(put 'gnus-picon-xbm-face 'face-alias 'gnus-picon-xbm) -(defface gnus-picon-face '((t (:foreground "black" :background "white"))) +(defface gnus-picon '((t (:foreground "black" :background "white"))) "Face to show picon in." :group 'gnus-picon) +;; backward-compatibility alias +(put 'gnus-picon-face 'face-alias 'gnus-picon) ;;; Internal variables: diff --git a/lisp/gnus-sieve.el b/lisp/gnus-sieve.el index e7409c39d..db9c8c91f 100644 --- a/lisp/gnus-sieve.el +++ b/lisp/gnus-sieve.el @@ -129,7 +129,7 @@ Return nil if no rule could be guessed." (let ((rule (gnus-sieve-guess-rule-for-article)) (info (gnus-get-info gnus-newsgroup-name))) (if (null rule) - (error "Could not guess rule for article.") + (error "Could not guess rule for article") (gnus-info-set-params info (cons rule (gnus-info-params info))) (message "Added rule in group %s for article: %s" gnus-newsgroup-name rule))))) diff --git a/lisp/gnus-srvr.el b/lisp/gnus-srvr.el index 8f9cdeb42..eb44157b6 100644 --- a/lisp/gnus-srvr.el +++ b/lisp/gnus-srvr.el @@ -168,67 +168,77 @@ If nil, a faster, but more primitive, buffer is used instead." "\C-c\C-i" gnus-info-find-node "\C-c\C-b" gnus-bug)) -(defface gnus-server-agent-face +(defface gnus-server-agent '((((class color) (background light)) (:foreground "PaleTurquoise" :bold t)) (((class color) (background dark)) (:foreground "PaleTurquoise" :bold t)) (t (:bold t))) "Face used for displaying AGENTIZED servers" :group 'gnus-server-visual) +;; backward-compatibility alias +(put 'gnus-server-agent-face 'face-alias 'gnus-server-agent) -(defface gnus-server-opened-face +(defface gnus-server-opened '((((class color) (background light)) (:foreground "Green3" :bold t)) (((class color) (background dark)) (:foreground "Green1" :bold t)) (t (:bold t))) "Face used for displaying OPENED servers" :group 'gnus-server-visual) +;; backward-compatibility alias +(put 'gnus-server-opened-face 'face-alias 'gnus-server-opened) -(defface gnus-server-closed-face +(defface gnus-server-closed '((((class color) (background light)) (:foreground "Steel Blue" :italic t)) (((class color) (background dark)) (:foreground "Light Steel Blue" :italic t)) (t (:italic t))) "Face used for displaying CLOSED servers" :group 'gnus-server-visual) +;; backward-compatibility alias +(put 'gnus-server-closed-face 'face-alias 'gnus-server-closed) -(defface gnus-server-denied-face +(defface gnus-server-denied '((((class color) (background light)) (:foreground "Red" :bold t)) (((class color) (background dark)) (:foreground "Pink" :bold t)) (t (:inverse-video t :bold t))) "Face used for displaying DENIED servers" :group 'gnus-server-visual) +;; backward-compatibility alias +(put 'gnus-server-denied-face 'face-alias 'gnus-server-denied) -(defface gnus-server-offline-face +(defface gnus-server-offline '((((class color) (background light)) (:foreground "Orange" :bold t)) (((class color) (background dark)) (:foreground "Yellow" :bold t)) (t (:inverse-video t :bold t))) "Face used for displaying OFFLINE servers" :group 'gnus-server-visual) +;; backward-compatibility alias +(put 'gnus-server-offline-face 'face-alias 'gnus-server-offline) -(defcustom gnus-server-agent-face 'gnus-server-agent-face +(defcustom gnus-server-agent-face 'gnus-server-agent "Face name to use on AGENTIZED servers." :version "22.1" :group 'gnus-server-visual :type 'face) -(defcustom gnus-server-opened-face 'gnus-server-opened-face +(defcustom gnus-server-opened-face 'gnus-server-opened "Face name to use on OPENED servers." :version "22.1" :group 'gnus-server-visual :type 'face) -(defcustom gnus-server-closed-face 'gnus-server-closed-face +(defcustom gnus-server-closed-face 'gnus-server-closed "Face name to use on CLOSED servers." :version "22.1" :group 'gnus-server-visual :type 'face) -(defcustom gnus-server-denied-face 'gnus-server-denied-face +(defcustom gnus-server-denied-face 'gnus-server-denied "Face name to use on DENIED servers." :version "22.1" :group 'gnus-server-visual :type 'face) -(defcustom gnus-server-offline-face 'gnus-server-offline-face +(defcustom gnus-server-offline-face 'gnus-server-offline "Face name to use on OFFLINE servers." :version "22.1" :group 'gnus-server-visual diff --git a/lisp/gnus-sum.el b/lisp/gnus-sum.el index 436cbcdd5..cd68db19a 100644 --- a/lisp/gnus-sum.el +++ b/lisp/gnus-sum.el @@ -320,7 +320,7 @@ This variable can either be the symbols `first' (place point on the first subject), `unread' (place point on the subject line of the first unread article), `best' (place point on the subject line of the higest-scored article), `unseen' (place point on the subject line of -the first unseen article), 'unseen-or-unread' (place point on the subject +the first unseen article), `unseen-or-unread' (place point on the subject line of the first unseen article or, if all article have been seen, on the subject line of the first unread article), or a function to be called to place point on some subject line." @@ -972,7 +972,7 @@ automatically when it is selected." :group 'gnus-summary :type 'boolean) -(defcustom gnus-summary-selected-face 'gnus-summary-selected-face +(defcustom gnus-summary-selected-face 'gnus-summary-selected "Face used for highlighting the current article in the summary buffer." :group 'gnus-summary-visual :type 'face) @@ -981,42 +981,42 @@ automatically when it is selected." (defcustom gnus-summary-highlight '(((eq mark gnus-canceled-mark) - . gnus-summary-cancelled-face) + . gnus-summary-cancelled) ((and uncached (> score default-high)) - . gnus-summary-high-undownloaded-face) + . gnus-summary-high-undownloaded) ((and uncached (< score default-low)) - . gnus-summary-low-undownloaded-face) + . gnus-summary-low-undownloaded) (uncached - . gnus-summary-normal-undownloaded-face) + . gnus-summary-normal-undownloaded) ((and (> score default-high) (or (eq mark gnus-dormant-mark) (eq mark gnus-ticked-mark))) - . gnus-summary-high-ticked-face) + . gnus-summary-high-ticked) ((and (< score default-low) (or (eq mark gnus-dormant-mark) (eq mark gnus-ticked-mark))) - . gnus-summary-low-ticked-face) + . gnus-summary-low-ticked) ((or (eq mark gnus-dormant-mark) (eq mark gnus-ticked-mark)) - . gnus-summary-normal-ticked-face) + . gnus-summary-normal-ticked) ((and (> score default-high) (eq mark gnus-ancient-mark)) - . gnus-summary-high-ancient-face) + . gnus-summary-high-ancient) ((and (< score default-low) (eq mark gnus-ancient-mark)) - . gnus-summary-low-ancient-face) + . gnus-summary-low-ancient) ((eq mark gnus-ancient-mark) - . gnus-summary-normal-ancient-face) + . gnus-summary-normal-ancient) ((and (> score default-high) (eq mark gnus-unread-mark)) - . gnus-summary-high-unread-face) + . gnus-summary-high-unread) ((and (< score default-low) (eq mark gnus-unread-mark)) - . gnus-summary-low-unread-face) + . gnus-summary-low-unread) ((eq mark gnus-unread-mark) - . gnus-summary-normal-unread-face) + . gnus-summary-normal-unread) ((> score default-high) - . gnus-summary-high-read-face) + . gnus-summary-high-read) ((< score default-low) - . gnus-summary-low-read-face) + . gnus-summary-low-read) (t - . gnus-summary-normal-read-face)) + . gnus-summary-normal-read)) "*Controls the highlighting of summary buffer lines. A list of (FORM . FACE) pairs. When deciding how a a particular diff --git a/lisp/gnus.el b/lisp/gnus.el index 336810383..6bc48ca57 100644 --- a/lisp/gnus.el +++ b/lisp/gnus.el @@ -353,7 +353,7 @@ be set in `.emacs' instead." ;; 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)) @@ -364,8 +364,10 @@ be set in `.emacs' instead." ())) "Level 1 newsgroup face." :group 'gnus-group) +;; backward-compatibility alias +(put 'gnus-group-news-1-face 'face-alias 'gnus-group-news-1) -(defface gnus-group-news-1-empty-face +(defface gnus-group-news-1-empty '((((class color) (background dark)) (:foreground "PaleTurquoise")) @@ -376,8 +378,10 @@ be set in `.emacs' instead." ())) "Level 1 empty newsgroup face." :group 'gnus-group) +;; backward-compatibility alias +(put 'gnus-group-news-1-empty-face 'face-alias 'gnus-group-news-1-empty) -(defface gnus-group-news-2-face +(defface gnus-group-news-2 '((((class color) (background dark)) (:foreground "turquoise" :bold t)) @@ -388,8 +392,10 @@ be set in `.emacs' instead." ())) "Level 2 newsgroup face." :group 'gnus-group) +;; backward-compatibility alias +(put 'gnus-group-news-2-face 'face-alias 'gnus-group-news-2) -(defface gnus-group-news-2-empty-face +(defface gnus-group-news-2-empty '((((class color) (background dark)) (:foreground "turquoise")) @@ -400,8 +406,10 @@ be set in `.emacs' instead." ())) "Level 2 empty newsgroup face." :group 'gnus-group) +;; backward-compatibility alias +(put 'gnus-group-news-2-empty-face 'face-alias 'gnus-group-news-2-empty) -(defface gnus-group-news-3-face +(defface gnus-group-news-3 '((((class color) (background dark)) (:bold t)) @@ -412,8 +420,10 @@ be set in `.emacs' instead." ())) "Level 3 newsgroup face." :group 'gnus-group) +;; backward-compatibility alias +(put 'gnus-group-news-3-face 'face-alias 'gnus-group-news-3) -(defface gnus-group-news-3-empty-face +(defface gnus-group-news-3-empty '((((class color) (background dark)) ()) @@ -424,8 +434,10 @@ be set in `.emacs' instead." ())) "Level 3 empty newsgroup face." :group 'gnus-group) +;; backward-compatibility alias +(put 'gnus-group-news-3-empty-face 'face-alias 'gnus-group-news-3-empty) -(defface gnus-group-news-4-face +(defface gnus-group-news-4 '((((class color) (background dark)) (:bold t)) @@ -436,8 +448,10 @@ be set in `.emacs' instead." ())) "Level 4 newsgroup face." :group 'gnus-group) +;; backward-compatibility alias +(put 'gnus-group-news-4-face 'face-alias 'gnus-group-news-4) -(defface gnus-group-news-4-empty-face +(defface gnus-group-news-4-empty '((((class color) (background dark)) ()) @@ -448,8 +462,10 @@ be set in `.emacs' instead." ())) "Level 4 empty newsgroup face." :group 'gnus-group) +;; backward-compatibility alias +(put 'gnus-group-news-4-empty-face 'face-alias 'gnus-group-news-4-empty) -(defface gnus-group-news-5-face +(defface gnus-group-news-5 '((((class color) (background dark)) (:bold t)) @@ -460,8 +476,10 @@ be set in `.emacs' instead." ())) "Level 5 newsgroup face." :group 'gnus-group) +;; backward-compatibility alias +(put 'gnus-group-news-5-face 'face-alias 'gnus-group-news-5) -(defface gnus-group-news-5-empty-face +(defface gnus-group-news-5-empty '((((class color) (background dark)) ()) @@ -472,8 +490,10 @@ be set in `.emacs' instead." ())) "Level 5 empty newsgroup face." :group 'gnus-group) +;; backward-compatibility alias +(put 'gnus-group-news-5-empty-face 'face-alias 'gnus-group-news-5-empty) -(defface gnus-group-news-6-face +(defface gnus-group-news-6 '((((class color) (background dark)) (:bold t)) @@ -484,8 +504,10 @@ be set in `.emacs' instead." ())) "Level 6 newsgroup face." :group 'gnus-group) +;; backward-compatibility alias +(put 'gnus-group-news-6-face 'face-alias 'gnus-group-news-6) -(defface gnus-group-news-6-empty-face +(defface gnus-group-news-6-empty '((((class color) (background dark)) ()) @@ -496,8 +518,10 @@ be set in `.emacs' instead." ())) "Level 6 empty newsgroup face." :group 'gnus-group) +;; backward-compatibility alias +(put 'gnus-group-news-6-empty-face 'face-alias 'gnus-group-news-6-empty) -(defface gnus-group-news-low-face +(defface gnus-group-news-low '((((class color) (background dark)) (:foreground "DarkTurquoise" :bold t)) @@ -508,8 +532,10 @@ be set in `.emacs' instead." ())) "Low level newsgroup face." :group 'gnus-group) +;; backward-compatibility alias +(put 'gnus-group-news-low-face 'face-alias 'gnus-group-news-low) -(defface gnus-group-news-low-empty-face +(defface gnus-group-news-low-empty '((((class color) (background dark)) (:foreground "DarkTurquoise")) @@ -520,8 +546,10 @@ be set in `.emacs' instead." ())) "Low level empty newsgroup face." :group 'gnus-group) +;; backward-compatibility alias +(put 'gnus-group-news-low-empty-face 'face-alias 'gnus-group-news-low-empty) -(defface gnus-group-mail-1-face +(defface gnus-group-mail-1 '((((class color) (background dark)) (:foreground "aquamarine1" :bold t)) @@ -532,8 +560,10 @@ be set in `.emacs' instead." (:bold t))) "Level 1 mailgroup face." :group 'gnus-group) +;; backward-compatibility alias +(put 'gnus-group-mail-1-face 'face-alias 'gnus-group-mail-1) -(defface gnus-group-mail-1-empty-face +(defface gnus-group-mail-1-empty '((((class color) (background dark)) (:foreground "aquamarine1")) @@ -544,8 +574,10 @@ be set in `.emacs' instead." (:italic t :bold t))) "Level 1 empty mailgroup face." :group 'gnus-group) +;; backward-compatibility alias +(put 'gnus-group-mail-1-empty-face 'face-alias 'gnus-group-mail-1-empty) -(defface gnus-group-mail-2-face +(defface gnus-group-mail-2 '((((class color) (background dark)) (:foreground "aquamarine2" :bold t)) @@ -556,8 +588,10 @@ be set in `.emacs' instead." (:bold t))) "Level 2 mailgroup face." :group 'gnus-group) +;; backward-compatibility alias +(put 'gnus-group-mail-2-face 'face-alias 'gnus-group-mail-2) -(defface gnus-group-mail-2-empty-face +(defface gnus-group-mail-2-empty '((((class color) (background dark)) (:foreground "aquamarine2")) @@ -568,8 +602,10 @@ be set in `.emacs' instead." (:bold t))) "Level 2 empty mailgroup face." :group 'gnus-group) +;; backward-compatibility alias +(put 'gnus-group-mail-2-empty-face 'face-alias 'gnus-group-mail-2-empty) -(defface gnus-group-mail-3-face +(defface gnus-group-mail-3 '((((class color) (background dark)) (:foreground "aquamarine3" :bold t)) @@ -580,8 +616,10 @@ be set in `.emacs' instead." (:bold t))) "Level 3 mailgroup face." :group 'gnus-group) +;; backward-compatibility alias +(put 'gnus-group-mail-3-face 'face-alias 'gnus-group-mail-3) -(defface gnus-group-mail-3-empty-face +(defface gnus-group-mail-3-empty '((((class color) (background dark)) (:foreground "aquamarine3")) @@ -592,8 +630,10 @@ be set in `.emacs' instead." ())) "Level 3 empty mailgroup face." :group 'gnus-group) +;; backward-compatibility alias +(put 'gnus-group-mail-3-empty-face 'face-alias 'gnus-group-mail-3-empty) -(defface gnus-group-mail-low-face +(defface gnus-group-mail-low '((((class color) (background dark)) (:foreground "aquamarine4" :bold t)) @@ -604,8 +644,10 @@ be set in `.emacs' instead." (:bold t))) "Low level mailgroup face." :group 'gnus-group) +;; backward-compatibility alias +(put 'gnus-group-mail-low-face 'face-alias 'gnus-group-mail-low) -(defface gnus-group-mail-low-empty-face +(defface gnus-group-mail-low-empty '((((class color) (background dark)) (:foreground "aquamarine4")) @@ -616,21 +658,26 @@ be set in `.emacs' instead." (: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) +;; backward-compatibility alias +(put 'gnus-summary-selected-face 'face-alias 'gnus-summary-selected) -(defface gnus-summary-cancelled-face +(defface gnus-summary-cancelled '((((class color)) (:foreground "yellow" :background "black"))) "Face used for cancelled articles." :group 'gnus-summary) +;; backward-compatibility alias +(put 'gnus-summary-cancelled-face 'face-alias 'gnus-summary-cancelled) -(defface gnus-summary-high-ticked-face +(defface gnus-summary-high-ticked '((((class color) (background dark)) (:foreground "pink" :bold t)) @@ -641,8 +688,10 @@ be set in `.emacs' instead." (:bold t))) "Face used for high interest ticked articles." :group 'gnus-summary) +;; backward-compatibility alias +(put 'gnus-summary-high-ticked-face 'face-alias 'gnus-summary-high-ticked) -(defface gnus-summary-low-ticked-face +(defface gnus-summary-low-ticked '((((class color) (background dark)) (:foreground "pink" :italic t)) @@ -653,8 +702,10 @@ be set in `.emacs' instead." (:italic t))) "Face used for low interest ticked articles." :group 'gnus-summary) +;; backward-compatibility alias +(put 'gnus-summary-low-ticked-face 'face-alias 'gnus-summary-low-ticked) -(defface gnus-summary-normal-ticked-face +(defface gnus-summary-normal-ticked '((((class color) (background dark)) (:foreground "pink")) @@ -665,8 +716,10 @@ be set in `.emacs' instead." ())) "Face used for normal interest ticked articles." :group 'gnus-summary) +;; backward-compatibility alias +(put 'gnus-summary-normal-ticked-face 'face-alias 'gnus-summary-normal-ticked) -(defface gnus-summary-high-ancient-face +(defface gnus-summary-high-ancient '((((class color) (background dark)) (:foreground "SkyBlue" :bold t)) @@ -677,8 +730,10 @@ be set in `.emacs' instead." (:bold t))) "Face used for high interest ancient articles." :group 'gnus-summary) +;; backward-compatibility alias +(put 'gnus-summary-high-ancient-face 'face-alias 'gnus-summary-high-ancient) -(defface gnus-summary-low-ancient-face +(defface gnus-summary-low-ancient '((((class color) (background dark)) (:foreground "SkyBlue" :italic t)) @@ -689,8 +744,10 @@ be set in `.emacs' instead." (:italic t))) "Face used for low interest ancient articles." :group 'gnus-summary) +;; backward-compatibility alias +(put 'gnus-summary-low-ancient-face 'face-alias 'gnus-summary-low-ancient) -(defface gnus-summary-normal-ancient-face +(defface gnus-summary-normal-ancient '((((class color) (background dark)) (:foreground "SkyBlue")) @@ -701,8 +758,10 @@ be set in `.emacs' instead." ())) "Face used for normal interest ancient articles." :group 'gnus-summary) +;; backward-compatibility alias +(put 'gnus-summary-normal-ancient-face 'face-alias 'gnus-summary-normal-ancient) -(defface gnus-summary-high-undownloaded-face +(defface gnus-summary-high-undownloaded '((((class color) (background light)) (:bold t :foreground "cyan4")) @@ -711,8 +770,10 @@ be set in `.emacs' instead." (t (:inverse-video t :bold t))) "Face used for high interest uncached articles." :group 'gnus-summary) +;; backward-compatibility alias +(put 'gnus-summary-high-undownloaded-face 'face-alias 'gnus-summary-high-undownloaded) -(defface gnus-summary-low-undownloaded-face +(defface gnus-summary-low-undownloaded '((((class color) (background light)) (:italic t :foreground "cyan4" :bold nil)) @@ -721,8 +782,10 @@ be set in `.emacs' instead." (t (:inverse-video t :italic t))) "Face used for low interest uncached articles." :group 'gnus-summary) +;; backward-compatibility alias +(put 'gnus-summary-low-undownloaded-face 'face-alias 'gnus-summary-low-undownloaded) -(defface gnus-summary-normal-undownloaded-face +(defface gnus-summary-normal-undownloaded '((((class color) (background light)) (:foreground "cyan4" :bold nil)) @@ -731,26 +794,34 @@ be set in `.emacs' instead." (t (:inverse-video t))) "Face used for normal interest uncached articles." :group 'gnus-summary) +;; backward-compatibility alias +(put 'gnus-summary-normal-undownloaded-face 'face-alias 'gnus-summary-normal-undownloaded) -(defface gnus-summary-high-unread-face +(defface gnus-summary-high-unread '((t (:bold t))) "Face used for high interest unread articles." :group 'gnus-summary) +;; backward-compatibility alias +(put 'gnus-summary-high-unread-face 'face-alias 'gnus-summary-high-unread) -(defface gnus-summary-low-unread-face +(defface gnus-summary-low-unread '((t (:italic t))) "Face used for low interest unread articles." :group 'gnus-summary) +;; backward-compatibility alias +(put 'gnus-summary-low-unread-face 'face-alias 'gnus-summary-low-unread) -(defface gnus-summary-normal-unread-face +(defface gnus-summary-normal-unread '((t ())) "Face used for normal interest unread articles." :group 'gnus-summary) +;; backward-compatibility alias +(put 'gnus-summary-normal-unread-face 'face-alias 'gnus-summary-normal-unread) -(defface gnus-summary-high-read-face +(defface gnus-summary-high-read '((((class color) (background dark)) (:foreground "PaleGreen" @@ -763,8 +834,10 @@ be set in `.emacs' instead." (:bold t))) "Face used for high interest read articles." :group 'gnus-summary) +;; backward-compatibility alias +(put 'gnus-summary-high-read-face 'face-alias 'gnus-summary-high-read) -(defface gnus-summary-low-read-face +(defface gnus-summary-low-read '((((class color) (background dark)) (:foreground "PaleGreen" @@ -777,8 +850,10 @@ be set in `.emacs' instead." (:italic t))) "Face used for low interest read articles." :group 'gnus-summary) +;; backward-compatibility alias +(put 'gnus-summary-low-read-face 'face-alias 'gnus-summary-low-read) -(defface gnus-summary-normal-read-face +(defface gnus-summary-normal-read '((((class color) (background dark)) (:foreground "PaleGreen")) @@ -789,6 +864,8 @@ be set in `.emacs' instead." ())) "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) ;;; @@ -832,7 +909,7 @@ be set in `.emacs' instead." (eval-and-compile (autoload 'gnus-play-jingle "gnus-audio")) -(defface gnus-splash-face +(defface gnus-splash '((((class color) (background dark)) (:foreground "#888888")) @@ -843,6 +920,8 @@ be set in `.emacs' instead." ())) "Face for the splash screen." :group 'gnus) +;; backward-compatibility alias +(put 'gnus-splash-face 'face-alias 'gnus-splash) (defun gnus-splash () (save-excursion @@ -921,11 +1000,11 @@ be set in `.emacs' instead." ("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))) @@ -969,7 +1048,7 @@ be set in `.emacs' instead." (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)) diff --git a/lisp/legacy-gnus-agent.el b/lisp/legacy-gnus-agent.el index 16b0cf6c8..50675b0ba 100644 --- a/lisp/legacy-gnus-agent.el +++ b/lisp/legacy-gnus-agent.el @@ -25,7 +25,7 @@ converted to the compressed format." ((file-directory-p member) (push member search-in)) ((equal (file-name-nondirectory member) ".agentview") - (setq converted-something + (setq converted-something (or (gnus-agent-convert-agentview member) converted-something)))))) @@ -175,7 +175,7 @@ converted to the compressed format." (t t)))))) (kill-buffer buffer)) - (error "Change gnus-agent-expire-days to an integer for gnus to start.")))) + (error "Change gnus-agent-expire-days to an integer for gnus to start")))) ;; The gnus-agent-unlist-expire-days has its own conversion prompt. ;; Therefore, hide the default prompt. @@ -198,8 +198,8 @@ possible that the hook was persistently saved." (when (cond ((eq (type-of func) 'compiled-function) ;; Search def. of compiled function for gnus-agent-do-once string - (let* (definition - print-level + (let* (definition + print-level print-length (standard-output (lambda (char) diff --git a/lisp/message.el b/lisp/message.el index b4f28eec5..d0c75b1bd 100644 --- a/lisp/message.el +++ b/lisp/message.el @@ -1153,7 +1153,7 @@ starting with `not' and followed by regexps." table) "Syntax table used while in Message mode.") -(defface message-header-to-face +(defface message-header-to '((((class color) (background dark)) (:foreground "green2" :bold t)) @@ -1164,8 +1164,10 @@ starting with `not' and followed by regexps." (:bold t :italic t))) "Face used for displaying From headers." :group 'message-faces) +;; backward-compatibility alias +(put 'message-header-to-face 'face-alias 'message-header-to) -(defface message-header-cc-face +(defface message-header-cc '((((class color) (background dark)) (:foreground "green4" :bold t)) @@ -1176,8 +1178,10 @@ starting with `not' and followed by regexps." (:bold t))) "Face used for displaying Cc headers." :group 'message-faces) +;; backward-compatibility alias +(put 'message-header-cc-face 'face-alias 'message-header-cc) -(defface message-header-subject-face +(defface message-header-subject '((((class color) (background dark)) (:foreground "green3")) @@ -1188,8 +1192,10 @@ starting with `not' and followed by regexps." (:bold t))) "Face used for displaying subject headers." :group 'message-faces) +;; backward-compatibility alias +(put 'message-header-subject-face 'face-alias 'message-header-subject) -(defface message-header-newsgroups-face +(defface message-header-newsgroups '((((class color) (background dark)) (:foreground "yellow" :bold t :italic t)) @@ -1200,8 +1206,10 @@ starting with `not' and followed by regexps." (:bold t :italic t))) "Face used for displaying newsgroups headers." :group 'message-faces) +;; backward-compatibility alias +(put 'message-header-newsgroups-face 'face-alias 'message-header-newsgroups) -(defface message-header-other-face +(defface message-header-other '((((class color) (background dark)) (:foreground "#b00000")) @@ -1212,8 +1220,10 @@ starting with `not' and followed by regexps." (:bold t :italic t))) "Face used for displaying newsgroups headers." :group 'message-faces) +;; backward-compatibility alias +(put 'message-header-other-face 'face-alias 'message-header-other) -(defface message-header-name-face +(defface message-header-name '((((class color) (background dark)) (:foreground "DarkGreen")) @@ -1224,8 +1234,10 @@ starting with `not' and followed by regexps." (:bold t))) "Face used for displaying header names." :group 'message-faces) +;; backward-compatibility alias +(put 'message-header-name-face 'face-alias 'message-header-name) -(defface message-header-xheader-face +(defface message-header-xheader '((((class color) (background dark)) (:foreground "blue")) @@ -1236,8 +1248,10 @@ starting with `not' and followed by regexps." (:bold t))) "Face used for displaying X-Header headers." :group 'message-faces) +;; backward-compatibility alias +(put 'message-header-xheader-face 'face-alias 'message-header-xheader) -(defface message-separator-face +(defface message-separator '((((class color) (background dark)) (:foreground "blue3")) @@ -1248,8 +1262,10 @@ starting with `not' and followed by regexps." (:bold t))) "Face used for displaying the separator." :group 'message-faces) +;; backward-compatibility alias +(put 'message-separator-face 'face-alias 'message-separator) -(defface message-cited-text-face +(defface message-cited-text '((((class color) (background dark)) (:foreground "red")) @@ -1260,8 +1276,10 @@ starting with `not' and followed by regexps." (:bold t))) "Face used for displaying cited text names." :group 'message-faces) +;; backward-compatibility alias +(put 'message-cited-text-face 'face-alias 'message-cited-text) -(defface message-mml-face +(defface message-mml '((((class color) (background dark)) (:foreground "ForestGreen")) @@ -1272,6 +1290,8 @@ starting with `not' and followed by regexps." (:bold t))) "Face used for displaying MML." :group 'message-faces) +;; backward-compatibility alias +(put 'message-mml-face 'face-alias 'message-mml) (defun message-font-lock-make-header-matcher (regexp) (let ((form @@ -1295,41 +1315,41 @@ starting with `not' and followed by regexps." (let ((content "[ \t]*\\(.+\\(\n[ \t].*\\)*\\)\n?")) `((,(message-font-lock-make-header-matcher (concat "^\\([Tt]o:\\)" content)) - (1 'message-header-name-face) - (2 'message-header-to-face nil t)) + (1 'message-header-name) + (2 'message-header-to nil t)) (,(message-font-lock-make-header-matcher (concat "^\\(^[GBF]?[Cc][Cc]:\\|^[Rr]eply-[Tt]o:\\)" content)) - (1 'message-header-name-face) - (2 'message-header-cc-face nil t)) + (1 'message-header-name) + (2 'message-header-cc nil t)) (,(message-font-lock-make-header-matcher (concat "^\\([Ss]ubject:\\)" content)) - (1 'message-header-name-face) - (2 'message-header-subject-face nil t)) + (1 'message-header-name) + (2 'message-header-subject nil t)) (,(message-font-lock-make-header-matcher (concat "^\\([Nn]ewsgroups:\\|Followup-[Tt]o:\\)" content)) - (1 'message-header-name-face) - (2 'message-header-newsgroups-face nil t)) + (1 'message-header-name) + (2 'message-header-newsgroups nil t)) (,(message-font-lock-make-header-matcher (concat "^\\([A-Z][^: \n\t]+:\\)" content)) - (1 'message-header-name-face) - (2 'message-header-other-face nil t)) + (1 'message-header-name) + (2 'message-header-other nil t)) (,(message-font-lock-make-header-matcher (concat "^\\(X-[A-Za-z0-9-]+:\\|In-Reply-To:\\)" content)) - (1 'message-header-name-face) - (2 'message-header-name-face)) + (1 'message-header-name) + (2 'message-header-name)) ,@(if (and mail-header-separator (not (equal mail-header-separator ""))) `((,(concat "^\\(" (regexp-quote mail-header-separator) "\\)$") - 1 'message-separator-face)) + 1 'message-separator)) nil) ((lambda (limit) (re-search-forward (concat "^\\(" message-cite-prefix-regexp "\\).*") limit t)) - (0 'message-cited-text-face)) + (0 'message-cited-text)) ("<#/?\\(multipart\\|part\\|external\\|mml\\|secure\\)[^>]*>" - (0 'message-mml-face)))) + (0 'message-mml)))) "Additional expressions to highlight in Message mode.") @@ -6010,9 +6030,9 @@ want to get rid of this query permanently.")) (defun message-is-yours-p () "Non-nil means current article is yours. -If you have added 'cancel-messages to 'message-shoot-gnksa-feet', all articles +If you have added 'cancel-messages to `message-shoot-gnksa-feet', all articles are yours except those that have Cancel-Lock header not belonging to you. -Instead of shooting GNKSA feet, you should modify 'message-alternative-emails' +Instead of shooting GNKSA feet, you should modify `message-alternative-emails' regexp to match all of yours addresses." ;; Canlock-logic as suggested by Per Abrahamsen ;; diff --git a/lisp/sieve-mode.el b/lisp/sieve-mode.el index d8a8ce9e9..b289f238f 100644 --- a/lisp/sieve-mode.el +++ b/lisp/sieve-mode.el @@ -64,10 +64,10 @@ ;; Font-lock -(defvar sieve-control-commands-face 'sieve-control-commands-face +(defvar sieve-control-commands-face 'sieve-control-commands "Face name used for Sieve Control Commands.") -(defface sieve-control-commands-face +(defface sieve-control-commands '((((type tty) (class color)) (:foreground "blue" :weight light)) (((class grayscale) (background light)) (:foreground "LightGray" :bold t)) (((class grayscale) (background dark)) (:foreground "DimGray" :bold t)) @@ -76,22 +76,26 @@ (t (:bold t))) "Face used for Sieve Control Commands." :group 'sieve) +;; backward-compatibility alias +(put 'sieve-control-commands-face 'face-alias 'sieve-control-commands) -(defvar sieve-action-commands-face 'sieve-action-commands-face +(defvar sieve-action-commands-face 'sieve-action-commands "Face name used for Sieve Action Commands.") -(defface sieve-action-commands-face +(defface sieve-action-commands '((((type tty) (class color)) (:foreground "blue" :weight bold)) (((class color) (background light)) (:foreground "Blue")) (((class color) (background dark)) (:foreground "LightSkyBlue")) (t (:inverse-video t :bold t))) "Face used for Sieve Action Commands." :group 'sieve) +;; backward-compatibility alias +(put 'sieve-action-commands-face 'face-alias 'sieve-action-commands) -(defvar sieve-test-commands-face 'sieve-test-commands-face +(defvar sieve-test-commands-face 'sieve-test-commands "Face name used for Sieve Test Commands.") -(defface sieve-test-commands-face +(defface sieve-test-commands '((((type tty) (class color)) (:foreground "magenta")) (((class grayscale) (background light)) (:foreground "LightGray" :bold t :underline t)) @@ -102,11 +106,13 @@ (t (:bold t :underline t))) "Face used for Sieve Test Commands." :group 'sieve) +;; backward-compatibility alias +(put 'sieve-test-commands-face 'face-alias 'sieve-test-commands) -(defvar sieve-tagged-arguments-face 'sieve-tagged-arguments-face +(defvar sieve-tagged-arguments-face 'sieve-tagged-arguments "Face name used for Sieve Tagged Arguments.") -(defface sieve-tagged-arguments-face +(defface sieve-tagged-arguments '((((type tty) (class color)) (:foreground "cyan" :weight bold)) (((class grayscale) (background light)) (:foreground "LightGray" :bold t)) (((class grayscale) (background dark)) (:foreground "DimGray" :bold t)) @@ -115,6 +121,8 @@ (t (:bold t))) "Face used for Sieve Tagged Arguments." :group 'sieve) +;; backward-compatibility alias +(put 'sieve-tagged-arguments-face 'face-alias 'sieve-tagged-arguments) (defconst sieve-font-lock-keywords diff --git a/lisp/spam.el b/lisp/spam.el index 888cdf7c0..742319d28 100644 --- a/lisp/spam.el +++ b/lisp/spam.el @@ -352,7 +352,7 @@ Only meaningful if you enable `spam-use-blackholes'." :type '(radio (const nil) regexp) :group 'spam) -(defface spam-face +(defface spam '((((class color) (type tty) (background dark)) (:foreground "gray80" :background "gray50")) (((class color) (type tty) (background light)) @@ -364,8 +364,10 @@ Only meaningful if you enable `spam-use-blackholes'." (t :inverse-video t)) "Face for spam-marked articles." :group 'spam) +;; backward-compatibility alias +(put 'spam-face 'face-alias 'spam) -(defcustom spam-face 'spam-face +(defcustom spam-face 'spam "Face for spam-marked articles." :type 'face :group 'spam) @@ -2881,8 +2883,8 @@ installed through spam-necessary-extra-headers." (add-to-list 'gnus-extra-headers header)) (setq spam-install-hooks t) - ;; TODO: How do we redo this every time spam-face is customized? - (push '((eq mark gnus-spam-mark) . spam-face) + ;; TODO: How do we redo this every time the `spam' face is customized? + (push '((eq mark gnus-spam-mark) . spam) gnus-summary-highlight) ;; Add hooks for loading and saving the spam stats (add-hook 'gnus-save-newsrc-hook 'spam-maybe-spam-stat-save)