From 0e107cbbe474bc239d57b0babd888b3cb905cb16 Mon Sep 17 00:00:00 2001 From: yamaoka Date: Tue, 17 May 2005 08:03:07 +0000 Subject: [PATCH] Synch to No Gnus 200505170802. --- contrib/ChangeLog | 4 ++ contrib/nnir.el | 3 +- lisp/ChangeLog | 81 +++++++++++++++++++++++++++++++++ lisp/canlock.el | 4 +- lisp/deuglify.el | 5 +- lisp/dig.el | 5 +- lisp/dns-mode.el | 5 +- lisp/encrypt.el | 3 +- lisp/gnus-cite.el | 39 ++++++++++------ lisp/gnus-diary.el | 5 +- lisp/gnus.el | 123 +++++++++++++++++++++++++++++++++----------------- lisp/hashcash.el | 28 ++++++++---- lisp/message.el | 3 +- lisp/netrc.el | 5 +- lisp/nnir.el | 3 +- lisp/sieve-manage.el | 27 +++++++---- lisp/sieve-mode.el | 14 ++++-- lisp/spam-report.el | 6 ++- lisp/spam.el | 9 ++-- 19 files changed, 275 insertions(+), 97 deletions(-) diff --git a/contrib/ChangeLog b/contrib/ChangeLog index 82ce97d..78acf73 100644 --- a/contrib/ChangeLog +++ b/contrib/ChangeLog @@ -1,3 +1,7 @@ +2005-05-17 Katsumi Yamaoka + + * nnir.el (nnir): Add :group. + 2005-01-26 Steve Youngs * gpg.el: Add timer/itimer compatibility. diff --git a/contrib/nnir.el b/contrib/nnir.el index 5d65d31..db3718a 100644 --- a/contrib/nnir.el +++ b/contrib/nnir.el @@ -376,7 +376,8 @@ Add an entry here when adding a new search engine.") ;;; User Customizable Variables: (defgroup nnir nil - "Search nnmh and nnml groups in Gnus with Glimpse, freeWAIS-sf, or EWS.") + "Search nnmh and nnml groups in Gnus with Glimpse, freeWAIS-sf, or EWS." + :group 'gnus) ;; Mail backend. diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 2bfa7d1..ea62135 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,84 @@ +2005-05-17 Katsumi Yamaoka + + * canlock.el (canlock): Change the parent group to news. + + * deuglify.el (gnus-outlook-deuglify): Add :group. + + * dig.el (dig): Add :group. + + * dns-mode.el (dns-mode): Add :group. + + * encrypt.el (encrypt): Add :group. + + * gnus-cite.el (gnus-cite-attribution-face): Add :group. + (gnus-cite-face-1, gnus-cite-face-2, gnus-cite-face-3): Ditto. + (gnus-cite-face-4, gnus-cite-face-5, gnus-cite-face-6): Ditto. + (gnus-cite-face-7, gnus-cite-face-8, gnus-cite-face-9): Ditto. + (gnus-cite-face-10, gnus-cite-face-11): Ditto. + + * gnus-diary.el (gnus-diary): Add :group. + + * gnus.el (gnus-group-news-1-face): Add :group. + (gnus-group-news-1-empty-face): Ditto. + (gnus-group-news-2-face, gnus-group-news-2-empty-face): Ditto. + (gnus-group-news-3-face, gnus-group-news-3-empty-face): Ditto. + (gnus-group-news-4-face, gnus-group-news-4-empty-face): Ditto. + (gnus-group-news-5-face, gnus-group-news-5-empty-face): Ditto. + (gnus-group-news-6-face, gnus-group-news-6-empty-face): Ditto. + (gnus-group-news-low-face, gnus-group-news-low-empty-face): Ditto. + (gnus-group-mail-1-face, gnus-group-mail-1-empty-face): Ditto. + (gnus-group-mail-2-face, gnus-group-mail-2-empty-face): Ditto. + (gnus-group-mail-3-face, gnus-group-mail-3-empty-face): Ditto. + (gnus-group-mail-low-face, gnus-group-mail-low-empty-face): Ditto. + (gnus-summary-selected-face, gnus-summary-cancelled-face): Ditto. + (gnus-summary-high-ticked-face): Ditto. + (gnus-summary-low-ticked-face): Ditto. + (gnus-summary-normal-ticked-face): Ditto. + (gnus-summary-high-ancient-face): Ditto. + (gnus-summary-low-ancient-face): Ditto. + (gnus-summary-normal-ancient-face): Ditto. + (gnus-summary-high-undownloaded-face): Ditto. + (gnus-summary-low-undownloaded-face): Ditto. + (gnus-summary-normal-undownloaded-face): Ditto. + (gnus-summary-high-unread-face): Ditto. + (gnus-summary-low-unread-face): Ditto. + (gnus-summary-normal-unread-face): Ditto. + (gnus-summary-high-read-face, gnus-summary-low-read-face): Diito + (gnus-summary-normal-read-face, gnus-splash-face): Ditto. + + * hashcash.el (hashcash): New custom group. + (hashcash-default-payment): Add :group. + (hashcash-payment-alist): Ditto. + (hashcash-default-accept-payment): Ditto. + (hashcash-accept-resources): Ditto. + (hashcash-path): Ditto. + (hashcash-extra-generate-parameters): Ditto. + (hashcash-double-spend-database): Ditto. + (hashcash-in-news): Ditto. + + * message.el (message-minibuffer-local-map): Add :group. + + * netrc.el (netrc): Add :group. + + * sieve-manage.el (sieve-manage-log): Add :group. + (sieve-manage-default-user): Diito. + (sieve-manage-server-eol, sieve-manage-client-eol): Ditto. + (sieve-manage-streams, sieve-manage-stream-alist): Ditto. + (sieve-manage-authenticators): Ditto. + (sieve-manage-authenticator-alist): Ditto + (sieve-manage-default-port): Ditto. + + * sieve-mode.el (sieve-control-commands-face): Add :group. + (sieve-action-commands-face): Ditto. + (sieve-test-commands-face): Ditto. + (sieve-tagged-arguments-face): Ditto. + + * smime.el (smime): Add :group. + + * spam-report.el (spam-report): Add :group. + + * spam.el (spam, spam-face): Add :group. + 2005-05-16 Lars Magne Ingebrigtsen * nntp.el (nntp-next-result-arrived-p): Some news servers may diff --git a/lisp/canlock.el b/lisp/canlock.el index 956800a..1ee5367 100644 --- a/lisp/canlock.el +++ b/lisp/canlock.el @@ -1,6 +1,6 @@ ;;; canlock.el --- functions for Cancel-Lock feature -;; Copyright (C) 1998, 1999, 2001, 2002, 2003, 2004 +;; Copyright (C) 1998, 1999, 2001, 2002, 2003, 2004, 2005 ;; Free Software Foundation, Inc. ;; Author: Katsumi Yamaoka @@ -50,7 +50,7 @@ (defgroup canlock nil "The Cancel-Lock feature." - :group 'applications) + :group 'news) (defcustom canlock-password nil "Password to use when signing a Cancel-Lock or a Cancel-Key header." diff --git a/lisp/deuglify.el b/lisp/deuglify.el index 347fbfa..e71d766 100644 --- a/lisp/deuglify.el +++ b/lisp/deuglify.el @@ -1,6 +1,6 @@ ;;; deuglify.el --- deuglify broken Outlook (Express) articles -;; Copyright (C) 2002, 2003, 2004 Free Software Foundation, Inc. +;; Copyright (C) 2002, 2003, 2004, 2005 Free Software Foundation, Inc. ;; Copyright (C) 2001, 2002 Raymond Scholz ;; Author: Raymond Scholz @@ -231,7 +231,8 @@ (defgroup gnus-outlook-deuglify nil "Deuglify articles generated by broken user agents like MS Outlook (Express)." - :version "22.1") + :version "22.1" + :group 'gnus) ;;;###autoload (defcustom gnus-outlook-deuglify-unwrap-min 45 diff --git a/lisp/dig.el b/lisp/dig.el index e71d6db..c0bc496 100644 --- a/lisp/dig.el +++ b/lisp/dig.el @@ -1,5 +1,5 @@ ;;; dig.el --- Domain Name System dig interface -;; Copyright (c) 2000, 2001, 2003 Free Software Foundation, Inc. +;; Copyright (c) 2000, 2001, 2003, 2005 Free Software Foundation, Inc. ;; Author: Simon Josefsson ;; Keywords: DNS BIND dig @@ -40,7 +40,8 @@ (eval-when-compile (require 'cl)) (defgroup dig nil - "Dig configuration.") + "Dig configuration." + :group 'comm) (defcustom dig-program "dig" "Name of dig (domain information groper) binary." diff --git a/lisp/dns-mode.el b/lisp/dns-mode.el index 0f1b71e..1be948e 100644 --- a/lisp/dns-mode.el +++ b/lisp/dns-mode.el @@ -1,5 +1,5 @@ ;;; dns-mode.el --- a mode for viewing/editing Domain Name System master files -;; Copyright (c) 2000, 2001, 2003, 2004 Free Software Foundation, Inc. +;; Copyright (c) 2000, 2001, 2003, 2004, 2005 Free Software Foundation, Inc. ;; Author: Simon Josefsson ;; Keywords: DNS master zone file SOA @@ -48,7 +48,8 @@ ;;; Code: (defgroup dns-mode nil - "DNS master file mode configuration.") + "DNS master file mode configuration." + :group 'comm) (defconst dns-mode-classes '("IN" "CS" "CH" "HS") "List of strings with known DNS classes.") diff --git a/lisp/encrypt.el b/lisp/encrypt.el index e5da278..2df548e 100644 --- a/lisp/encrypt.el +++ b/lisp/encrypt.el @@ -41,7 +41,8 @@ (defgroup encrypt '((password-cache custom-variable) (password-cache-expiry custom-variable)) - "File encryption configuration.") + "File encryption configuration." + :group 'applications) (defcustom encrypt-file-alist nil "List of file names or regexes matched with encryptions. diff --git a/lisp/gnus-cite.el b/lisp/gnus-cite.el index daa6862..2c2dabd 100644 --- a/lisp/gnus-cite.el +++ b/lisp/gnus-cite.el @@ -1,6 +1,7 @@ ;;; gnus-cite.el --- parse citations in articles for Gnus -;; Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004 +;; Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, +;; 2005 ;; Free Software Foundation, Inc. ;; Author: Per Abhiddenware @@ -139,7 +140,8 @@ the envelope From line." (defface gnus-cite-attribution-face '((t (:italic t))) - "Face used for attribution lines.") + "Face used for attribution lines." + :group 'gnus-cite) (defcustom gnus-cite-attribution-face 'gnus-cite-attribution-face "Face used for attribution lines. @@ -156,7 +158,8 @@ It is merged with the face for the cited text belonging to the attribution." (:foreground "MidnightBlue")) (t (:italic t))) - "Citation face.") + "Citation face." + :group 'gnus-cite) (defface gnus-cite-face-2 '((((class color) (background dark)) @@ -166,7 +169,8 @@ It is merged with the face for the cited text belonging to the attribution." (:foreground "firebrick")) (t (:italic t))) - "Citation face.") + "Citation face." + :group 'gnus-cite) (defface gnus-cite-face-3 '((((class color) (background dark)) @@ -176,7 +180,8 @@ It is merged with the face for the cited text belonging to the attribution." (:foreground "dark green")) (t (:italic t))) - "Citation face.") + "Citation face." + :group 'gnus-cite) (defface gnus-cite-face-4 '((((class color) (background dark)) @@ -186,7 +191,8 @@ It is merged with the face for the cited text belonging to the attribution." (:foreground "OrangeRed")) (t (:italic t))) - "Citation face.") + "Citation face." + :group 'gnus-cite) (defface gnus-cite-face-5 '((((class color) (background dark)) @@ -196,7 +202,8 @@ It is merged with the face for the cited text belonging to the attribution." (:foreground "dark khaki")) (t (:italic t))) - "Citation face.") + "Citation face." + :group 'gnus-cite) (defface gnus-cite-face-6 '((((class color) (background dark)) @@ -206,7 +213,8 @@ It is merged with the face for the cited text belonging to the attribution." (:foreground "dark violet")) (t (:italic t))) - "Citation face.") + "Citation face." + :group 'gnus-cite) (defface gnus-cite-face-7 '((((class color) (background dark)) @@ -216,7 +224,8 @@ It is merged with the face for the cited text belonging to the attribution." (:foreground "SteelBlue4")) (t (:italic t))) - "Citation face.") + "Citation face." + :group 'gnus-cite) (defface gnus-cite-face-8 '((((class color) (background dark)) @@ -226,7 +235,8 @@ It is merged with the face for the cited text belonging to the attribution." (:foreground "magenta")) (t (:italic t))) - "Citation face.") + "Citation face." + :group 'gnus-cite) (defface gnus-cite-face-9 '((((class color) (background dark)) @@ -236,7 +246,8 @@ It is merged with the face for the cited text belonging to the attribution." (:foreground "violet")) (t (:italic t))) - "Citation face.") + "Citation face." + :group 'gnus-cite) (defface gnus-cite-face-10 '((((class color) (background dark)) @@ -246,7 +257,8 @@ It is merged with the face for the cited text belonging to the attribution." (:foreground "medium purple")) (t (:italic t))) - "Citation face.") + "Citation face." + :group 'gnus-cite) (defface gnus-cite-face-11 '((((class color) (background dark)) @@ -256,7 +268,8 @@ It is merged with the face for the cited text belonging to the attribution." (:foreground "turquoise")) (t (:italic t))) - "Citation face.") + "Citation face." + :group 'gnus-cite) (defcustom gnus-cite-face-list '(gnus-cite-face-1 gnus-cite-face-2 gnus-cite-face-3 gnus-cite-face-4 diff --git a/lisp/gnus-diary.el b/lisp/gnus-diary.el index e75467c..f35ca76 100644 --- a/lisp/gnus-diary.el +++ b/lisp/gnus-diary.el @@ -1,6 +1,6 @@ ;;; gnus-diary.el --- Wrapper around the NNDiary Gnus backend -;; Copyright (c) 2001, 2002, 2003 Free Software Foundation, Inc. +;; Copyright (c) 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. ;; Copyright (C) 1999, 2000, 2001 Didier Verna. ;; Author: Didier Verna @@ -103,7 +103,8 @@ (defgroup gnus-diary nil "Utilities on top of the nndiary backend for Gnus." - :version "22.1") + :version "22.1" + :group 'gnus) (defcustom gnus-diary-summary-line-format "%U%R%z %uD: %(%s%) (%ud)\n" "*Summary line format for nndiary groups." diff --git a/lisp/gnus.el b/lisp/gnus.el index 8e59d26..43a1de2 100644 --- a/lisp/gnus.el +++ b/lisp/gnus.el @@ -361,7 +361,8 @@ be set in `.emacs' instead." (:foreground "ForestGreen" :bold t)) (t ())) - "Level 1 newsgroup face.") + "Level 1 newsgroup face." + :group 'gnus-group) (defface gnus-group-news-1-empty-face '((((class color) @@ -372,7 +373,8 @@ be set in `.emacs' instead." (:foreground "ForestGreen")) (t ())) - "Level 1 empty newsgroup face.") + "Level 1 empty newsgroup face." + :group 'gnus-group) (defface gnus-group-news-2-face '((((class color) @@ -383,7 +385,8 @@ be set in `.emacs' instead." (:foreground "CadetBlue4" :bold t)) (t ())) - "Level 2 newsgroup face.") + "Level 2 newsgroup face." + :group 'gnus-group) (defface gnus-group-news-2-empty-face '((((class color) @@ -394,7 +397,8 @@ be set in `.emacs' instead." (:foreground "CadetBlue4")) (t ())) - "Level 2 empty newsgroup face.") + "Level 2 empty newsgroup face." + :group 'gnus-group) (defface gnus-group-news-3-face '((((class color) @@ -405,7 +409,8 @@ be set in `.emacs' instead." (:bold t)) (t ())) - "Level 3 newsgroup face.") + "Level 3 newsgroup face." + :group 'gnus-group) (defface gnus-group-news-3-empty-face '((((class color) @@ -416,7 +421,8 @@ be set in `.emacs' instead." ()) (t ())) - "Level 3 empty newsgroup face.") + "Level 3 empty newsgroup face." + :group 'gnus-group) (defface gnus-group-news-4-face '((((class color) @@ -427,7 +433,8 @@ be set in `.emacs' instead." (:bold t)) (t ())) - "Level 4 newsgroup face.") + "Level 4 newsgroup face." + :group 'gnus-group) (defface gnus-group-news-4-empty-face '((((class color) @@ -438,7 +445,8 @@ be set in `.emacs' instead." ()) (t ())) - "Level 4 empty newsgroup face.") + "Level 4 empty newsgroup face." + :group 'gnus-group) (defface gnus-group-news-5-face '((((class color) @@ -449,7 +457,8 @@ be set in `.emacs' instead." (:bold t)) (t ())) - "Level 5 newsgroup face.") + "Level 5 newsgroup face." + :group 'gnus-group) (defface gnus-group-news-5-empty-face '((((class color) @@ -460,7 +469,8 @@ be set in `.emacs' instead." ()) (t ())) - "Level 5 empty newsgroup face.") + "Level 5 empty newsgroup face." + :group 'gnus-group) (defface gnus-group-news-6-face '((((class color) @@ -471,7 +481,8 @@ be set in `.emacs' instead." (:bold t)) (t ())) - "Level 6 newsgroup face.") + "Level 6 newsgroup face." + :group 'gnus-group) (defface gnus-group-news-6-empty-face '((((class color) @@ -482,7 +493,8 @@ be set in `.emacs' instead." ()) (t ())) - "Level 6 empty newsgroup face.") + "Level 6 empty newsgroup face." + :group 'gnus-group) (defface gnus-group-news-low-face '((((class color) @@ -493,7 +505,8 @@ be set in `.emacs' instead." (:foreground "DarkGreen" :bold t)) (t ())) - "Low level newsgroup face.") + "Low level newsgroup face." + :group 'gnus-group) (defface gnus-group-news-low-empty-face '((((class color) @@ -504,7 +517,8 @@ be set in `.emacs' instead." (:foreground "DarkGreen")) (t ())) - "Low level empty newsgroup face.") + "Low level empty newsgroup face." + :group 'gnus-group) (defface gnus-group-mail-1-face '((((class color) @@ -515,7 +529,8 @@ be set in `.emacs' instead." (:foreground "DeepPink3" :bold t)) (t (:bold t))) - "Level 1 mailgroup face.") + "Level 1 mailgroup face." + :group 'gnus-group) (defface gnus-group-mail-1-empty-face '((((class color) @@ -526,7 +541,8 @@ be set in `.emacs' instead." (:foreground "DeepPink3")) (t (:italic t :bold t))) - "Level 1 empty mailgroup face.") + "Level 1 empty mailgroup face." + :group 'gnus-group) (defface gnus-group-mail-2-face '((((class color) @@ -537,7 +553,8 @@ be set in `.emacs' instead." (:foreground "HotPink3" :bold t)) (t (:bold t))) - "Level 2 mailgroup face.") + "Level 2 mailgroup face." + :group 'gnus-group) (defface gnus-group-mail-2-empty-face '((((class color) @@ -548,7 +565,8 @@ be set in `.emacs' instead." (:foreground "HotPink3")) (t (:bold t))) - "Level 2 empty mailgroup face.") + "Level 2 empty mailgroup face." + :group 'gnus-group) (defface gnus-group-mail-3-face '((((class color) @@ -559,7 +577,8 @@ be set in `.emacs' instead." (:foreground "magenta4" :bold t)) (t (:bold t))) - "Level 3 mailgroup face.") + "Level 3 mailgroup face." + :group 'gnus-group) (defface gnus-group-mail-3-empty-face '((((class color) @@ -570,7 +589,8 @@ be set in `.emacs' instead." (:foreground "magenta4")) (t ())) - "Level 3 empty mailgroup face.") + "Level 3 empty mailgroup face." + :group 'gnus-group) (defface gnus-group-mail-low-face '((((class color) @@ -581,7 +601,8 @@ be set in `.emacs' instead." (:foreground "DeepPink4" :bold t)) (t (:bold t))) - "Low level mailgroup face.") + "Low level mailgroup face." + :group 'gnus-group) (defface gnus-group-mail-low-empty-face '((((class color) @@ -592,18 +613,21 @@ be set in `.emacs' instead." (:foreground "DeepPink4")) (t (:bold t))) - "Low level empty mailgroup face.") + "Low level empty mailgroup face." + :group 'gnus-group) ;; Summary mode faces. (defface gnus-summary-selected-face '((t (:underline t))) - "Face used for selected articles.") + "Face used for selected articles." + :group 'gnus-summary) (defface gnus-summary-cancelled-face '((((class color)) (:foreground "yellow" :background "black"))) - "Face used for cancelled articles.") + "Face used for cancelled articles." + :group 'gnus-summary) (defface gnus-summary-high-ticked-face '((((class color) @@ -614,7 +638,8 @@ be set in `.emacs' instead." (:foreground "firebrick" :bold t)) (t (:bold t))) - "Face used for high interest ticked articles.") + "Face used for high interest ticked articles." + :group 'gnus-summary) (defface gnus-summary-low-ticked-face '((((class color) @@ -625,7 +650,8 @@ be set in `.emacs' instead." (:foreground "firebrick" :italic t)) (t (:italic t))) - "Face used for low interest ticked articles.") + "Face used for low interest ticked articles." + :group 'gnus-summary) (defface gnus-summary-normal-ticked-face '((((class color) @@ -636,7 +662,8 @@ be set in `.emacs' instead." (:foreground "firebrick")) (t ())) - "Face used for normal interest ticked articles.") + "Face used for normal interest ticked articles." + :group 'gnus-summary) (defface gnus-summary-high-ancient-face '((((class color) @@ -647,7 +674,8 @@ be set in `.emacs' instead." (:foreground "RoyalBlue" :bold t)) (t (:bold t))) - "Face used for high interest ancient articles.") + "Face used for high interest ancient articles." + :group 'gnus-summary) (defface gnus-summary-low-ancient-face '((((class color) @@ -658,7 +686,8 @@ be set in `.emacs' instead." (:foreground "RoyalBlue" :italic t)) (t (:italic t))) - "Face used for low interest ancient articles.") + "Face used for low interest ancient articles." + :group 'gnus-summary) (defface gnus-summary-normal-ancient-face '((((class color) @@ -669,7 +698,8 @@ be set in `.emacs' instead." (:foreground "RoyalBlue")) (t ())) - "Face used for normal interest ancient articles.") + "Face used for normal interest ancient articles." + :group 'gnus-summary) (defface gnus-summary-high-undownloaded-face '((((class color) @@ -678,7 +708,8 @@ be set in `.emacs' instead." (((class color) (background dark)) (:bold t :foreground "LightGray")) (t (:inverse-video t :bold t))) - "Face used for high interest uncached articles.") + "Face used for high interest uncached articles." + :group 'gnus-summary) (defface gnus-summary-low-undownloaded-face '((((class color) @@ -687,7 +718,8 @@ be set in `.emacs' instead." (((class color) (background dark)) (:italic t :foreground "LightGray" :bold nil)) (t (:inverse-video t :italic t))) - "Face used for low interest uncached articles.") + "Face used for low interest uncached articles." + :group 'gnus-summary) (defface gnus-summary-normal-undownloaded-face '((((class color) @@ -696,27 +728,32 @@ be set in `.emacs' instead." (((class color) (background dark)) (:foreground "LightGray" :bold nil)) (t (:inverse-video t))) - "Face used for normal interest uncached articles.") + "Face used for normal interest uncached articles." + :group 'gnus-summary) (defface gnus-summary-high-unread-face '((t (:bold t))) - "Face used for high interest unread articles.") + "Face used for high interest unread articles." + :group 'gnus-summary) (defface gnus-summary-low-unread-face '((t (:italic t))) - "Face used for low interest unread articles.") + "Face used for low interest unread articles." + :group 'gnus-summary) (defface gnus-summary-normal-unread-face '((t ())) - "Face used for normal interest unread articles.") + "Face used for normal interest unread articles." + :group 'gnus-summary) (defface gnus-summary-incorporated-face '((t ())) - "Face used for incorporated articles.") + "Face used for incorporated articles." + :group 'gnus-summary) (defface gnus-summary-high-read-face '((((class color) @@ -729,7 +766,8 @@ be set in `.emacs' instead." :bold t)) (t (:bold t))) - "Face used for high interest read articles.") + "Face used for high interest read articles." + :group 'gnus-summary) (defface gnus-summary-low-read-face '((((class color) @@ -742,7 +780,8 @@ be set in `.emacs' instead." :italic t)) (t (:italic t))) - "Face used for low interest read articles.") + "Face used for low interest read articles." + :group 'gnus-summary) (defface gnus-summary-normal-read-face '((((class color) @@ -753,7 +792,8 @@ be set in `.emacs' instead." (:foreground "DarkGreen")) (t ())) - "Face used for normal interest read articles.") + "Face used for normal interest read articles." + :group 'gnus-summary) ;;; @@ -806,7 +846,8 @@ be set in `.emacs' instead." (:foreground "#888888")) (t ())) - "Face for the splash screen.") + "Face for the splash screen." + :group 'gnus) (defun gnus-splash () (save-excursion diff --git a/lisp/hashcash.el b/lisp/hashcash.el index db190b0..20ad85c 100644 --- a/lisp/hashcash.el +++ b/lisp/hashcash.el @@ -49,11 +49,16 @@ ;;; Code: +(defgroup hashcash nil + "Hashcash configuration." + :group 'mail) + (defcustom hashcash-default-payment 20 "*The default number of bits to pay to unknown users. If this is zero, no payment header will be generated. See `hashcash-payment-alist'." - :type 'integer) + :type 'integer + :group 'hashcash) (defcustom hashcash-payment-alist '() "*An association list mapping email addresses to payment amounts. @@ -67,32 +72,39 @@ present, is the string to be hashed; if not present ADDR will be used." (list :tag "Replace hash input" (string :name "Address") (string :name "Hash input") - (integer :name "Amount"))))) + (integer :name "Amount")))) + :group 'hashcash) (defcustom hashcash-default-accept-payment 20 "*The default minimum number of bits to accept on incoming payments." - :type 'integer) + :type 'integer + :group 'hashcash) (defcustom hashcash-accept-resources `((,user-mail-address nil)) "*An association list mapping hashcash resources to payment amounts. Resources named here are to be accepted in incoming payments. If the corresponding AMOUNT is NIL, the value of `hashcash-default-accept-payment' -is used instead.") +is used instead." + :group 'hashcash) (defcustom hashcash-path (executable-find "hashcash") - "*The path to the hashcash binary.") + "*The path to the hashcash binary." + :group 'hashcash) (defcustom hashcash-extra-generate-parameters nil "*A list of parameter strings passed to `hashcash-path' when minting. For example, you may want to set this to '(\"-Z2\") to reduce header length." - :type '(repeat string)) + :type '(repeat string) + :group 'hashcash) (defcustom hashcash-double-spend-database "hashcash.db" - "*The path to the double-spending database.") + "*The path to the double-spending database." + :group 'hashcash) (defcustom hashcash-in-news nil "*Specifies whether or not hashcash payments should be made to newsgroups." - :type 'boolean) + :type 'boolean + :group 'hashcash) (defvar hashcash-process-alist nil "Alist of asynchronous hashcash processes and buffers.") diff --git a/lisp/message.el b/lisp/message.el index be0326a..f4c3f51 100644 --- a/lisp/message.el +++ b/lisp/message.el @@ -1021,7 +1021,8 @@ The function `message-supersede' runs this hook." (set-keymap-parent map minibuffer-local-map) map) "Keymap for `message-read-from-minibuffer'." - :version "22.1") + :version "22.1" + :group 'message-various) ;;;###autoload (defcustom message-citation-line-function 'message-insert-citation-line diff --git a/lisp/netrc.el b/lisp/netrc.el index 0d59125..632a682 100644 --- a/lisp/netrc.el +++ b/lisp/netrc.el @@ -1,5 +1,5 @@ ;;; netrc.el --- .netrc parsing functionality -;; Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002 +;; Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2004, 2005 ;; Free Software Foundation, Inc. ;; Author: Lars Magne Ingebrigtsen @@ -40,7 +40,8 @@ (autoload 'encrypt-insert-file-contents "encrypt")) (defgroup netrc nil - "Netrc configuration.") + "Netrc configuration." + :group 'comm) (defvar netrc-services-file "/etc/services" "The name of the services file.") diff --git a/lisp/nnir.el b/lisp/nnir.el index 846db89..e38c9ab 100644 --- a/lisp/nnir.el +++ b/lisp/nnir.el @@ -339,7 +339,8 @@ Add an entry here when adding a new search engine.") ;;; User Customizable Variables: (defgroup nnir nil - "Search nnmh and nnml groups in Gnus with Glimpse, freeWAIS-sf, or EWS.") + "Search nnmh and nnml groups in Gnus with Glimpse, freeWAIS-sf, or EWS." + :group 'gnus) ;; Mail backend. diff --git a/lisp/sieve-manage.el b/lisp/sieve-manage.el index 63588b8..663dcdd 100644 --- a/lisp/sieve-manage.el +++ b/lisp/sieve-manage.el @@ -91,22 +91,27 @@ (defcustom sieve-manage-log "*sieve-manage-log*" "Name of buffer for managesieve session trace." - :type 'string) + :type 'string + :group 'sieve-manage) (defcustom sieve-manage-default-user (user-login-name) "Default username to use." - :type 'string) + :type 'string + :group 'sieve-manage) (defcustom sieve-manage-server-eol "\r\n" "The EOL string sent from the server." - :type 'string) + :type 'string + :group 'sieve-manage) (defcustom sieve-manage-client-eol "\r\n" "The EOL string we send to the server." - :type 'string) + :type 'string + :group 'sieve-manage) (defcustom sieve-manage-streams '(network starttls shell) - "Priority of streams to consider when opening connection to server.") + "Priority of streams to consider when opening connection to server." + :group 'sieve-manage) (defcustom sieve-manage-stream-alist '((network sieve-manage-network-p sieve-manage-network-open) @@ -118,7 +123,8 @@ NAME names the stream, CHECK is a function returning non-nil if the server support the stream and OPEN is a function for opening the -stream.") +stream." + :group 'sieve-manage) (defcustom sieve-manage-authenticators '(digest-md5 cram-md5 @@ -126,7 +132,8 @@ stream.") ntlm plain login) - "Priority of authenticators to consider when authenticating to server.") + "Priority of authenticators to consider when authenticating to server." + :group 'sieve-manage) (defcustom sieve-manage-authenticator-alist '((cram-md5 sieve-manage-cram-md5-p sieve-manage-cram-md5-auth) @@ -141,11 +148,13 @@ stream.") NAME names the authenticator. CHECK is a function returning non-nil if the server support the authenticator and AUTHENTICATE is a function -for doing the actual authentication.") +for doing the actual authentication." + :group 'sieve-manage) (defcustom sieve-manage-default-port 2000 "Default port number for managesieve protocol." - :type 'integer) + :type 'integer + :group 'sieve-manage) ;; Internal variables: diff --git a/lisp/sieve-mode.el b/lisp/sieve-mode.el index f105ced..cd8a3a3 100644 --- a/lisp/sieve-mode.el +++ b/lisp/sieve-mode.el @@ -1,5 +1,5 @@ ;;; sieve-mode.el --- Sieve code editing commands for Emacs -;; Copyright (C) 2001, 2003, 2004 Free Software Foundation, Inc. +;; Copyright (C) 2001, 2003, 2004, 2005 Free Software Foundation, Inc. ;; Author: Simon Josefsson @@ -74,7 +74,8 @@ (((class color) (background light)) (:foreground "Orchid")) (((class color) (background dark)) (:foreground "LightSteelBlue")) (t (:bold t))) - "Face used for Sieve Control Commands.") + "Face used for Sieve Control Commands." + :group 'sieve) (defvar sieve-action-commands-face 'sieve-action-commands-face "Face name used for Sieve Action Commands.") @@ -84,7 +85,8 @@ (((class color) (background light)) (:foreground "Blue")) (((class color) (background dark)) (:foreground "LightSkyBlue")) (t (:inverse-video t :bold t))) - "Face used for Sieve Action Commands.") + "Face used for Sieve Action Commands." + :group 'sieve) (defvar sieve-test-commands-face 'sieve-test-commands-face "Face name used for Sieve Test Commands.") @@ -98,7 +100,8 @@ (((class color) (background light)) (:foreground "CadetBlue")) (((class color) (background dark)) (:foreground "Aquamarine")) (t (:bold t :underline t))) - "Face used for Sieve Test Commands.") + "Face used for Sieve Test Commands." + :group 'sieve) (defvar sieve-tagged-arguments-face 'sieve-tagged-arguments-face "Face name used for Sieve Tagged Arguments.") @@ -110,7 +113,8 @@ (((class color) (background light)) (:foreground "Purple")) (((class color) (background dark)) (:foreground "Cyan")) (t (:bold t))) - "Face used for Sieve Tagged Arguments.") + "Face used for Sieve Tagged Arguments." + :group 'sieve) (defconst sieve-font-lock-keywords diff --git a/lisp/spam-report.el b/lisp/spam-report.el index dcd9557..6d12ef8 100644 --- a/lisp/spam-report.el +++ b/lisp/spam-report.el @@ -1,5 +1,5 @@ ;;; spam-report.el --- Reporting spam -;; Copyright (C) 2002, 2003, 2004 Free Software Foundation, Inc. +;; Copyright (C) 2002, 2003, 2004, 2005 Free Software Foundation, Inc. ;; Author: Teodor Zlatanov ;; Keywords: network @@ -35,7 +35,9 @@ (autoload 'mm-url-insert "mm-url")) (defgroup spam-report nil - "Spam reporting configuration.") + "Spam reporting configuration." + :group 'mail + :group 'news) (defcustom spam-report-gmane-regex nil "Regexp matching Gmane newsgroups, e.g. \"^nntp\\+.*:gmane\\.\" diff --git a/lisp/spam.el b/lisp/spam.el index 9fc0b9e..c20a3d0 100644 --- a/lisp/spam.el +++ b/lisp/spam.el @@ -1,5 +1,5 @@ ;;; spam.el --- Identifying spam -;; Copyright (C) 2002, 2003, 2004 Free Software Foundation, Inc. +;; Copyright (C) 2002, 2003, 2004, 2005 Free Software Foundation, Inc. ;; Author: Lars Magne Ingebrigtsen ;; Keywords: network @@ -80,7 +80,9 @@ Populated by spam-install-backend-super.") (defgroup spam nil "Spam configuration." - :version "22.1") + :version "22.1" + :group 'mail + :group 'news) (defcustom spam-summary-exit-behavior 'default "Exit behavior at the time of summary exit. @@ -360,7 +362,8 @@ Only meaningful if you enable `spam-use-blackholes'." (((class color) (background light)) (:foreground "ivory4")) (t :inverse-video t)) - "Face for spam-marked articles.") + "Face for spam-marked articles." + :group 'spam) (defcustom spam-face 'spam-face "Face for spam-marked articles." -- 1.7.10.4