Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-324

Merge from gnus--rel--5.10

Patches applied:

 * gnus--rel--5.10  (patch 70)

   - Update from CVS

2005-05-17  Katsumi Yamaoka  <yamaoka@jpl.org>

   * lisp/gnus/canlock.el (canlock): Change the parent group to news.

   * lisp/gnus/deuglify.el (gnus-outlook-deuglify): Add :group.

   * lisp/gnus/dig.el (dig): Add :group.

   * lisp/gnus/gnus-art.el (gnus-inhibit-mime-unbuttonizing): Add :group.

   * lisp/gnus/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.

   * lisp/gnus/gnus-diary.el (gnus-diary): Add :group.

   * lisp/gnus/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.

   * lisp/gnus/message.el (message-minibuffer-local-map): Add :group.

   * lisp/gnus/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.

   * lisp/gnus/sieve-mode.el (sieve-control-commands-face): Add :group.
   (sieve-action-commands-face): Ditto.
   (sieve-test-commands-face): Ditto.
   (sieve-tagged-arguments-face): Ditto.

   * lisp/gnus/smime.el (smime): Add :group.

   * lisp/gnus/spam-report.el (spam-report): Add :group.

   * lisp/gnus/spam.el (spam, spam-face): Add :group.

14 files changed, 226 insertions, 82 deletions

diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog
index 93e612207d9..4498ac3f1c3 100644
--- a/lisp/gnus/ChangeLog
+++ b/lisp/gnus/ChangeLog
@@ -1,3 +1,70 @@
+2005-05-17  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+        * canlock.el (canlock): Change the parent group to news.
+
+        * deuglify.el (gnus-outlook-deuglify): Add :group.
+
+        * dig.el (dig): Add :group.
+
+        * gnus-art.el (gnus-inhibit-mime-unbuttonizing): 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.
+
+        * message.el (message-minibuffer-local-map): 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-26  Lute Kamstra  <lute@gnu.org>
 
         * score-mode.el (gnus-score-mode): Use run-mode-hooks.
diff --git a/lisp/gnus/canlock.el b/lisp/gnus/canlock.el
index 71c7dbe03d8..126ec0c60ca 100644
--- a/lisp/gnus/canlock.el
+++ b/lisp/gnus/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 <yamaoka@jpl.org>
@@ -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/gnus/deuglify.el b/lisp/gnus/deuglify.el
index 0dc6e6d002a..cae18951f7e 100644
--- a/lisp/gnus/deuglify.el
+++ b/lisp/gnus/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 <rscholz@zonix.de>
@@ -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/gnus/dig.el b/lisp/gnus/dig.el
index 08070e985f8..a3d55cbf824 100644
--- a/lisp/gnus/dig.el
+++ b/lisp/gnus/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 <simon@josefsson.org>
 ;; 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/gnus/gnus-art.el b/lisp/gnus/gnus-art.el
index b1a51d65edd..5d0e7835d7f 100644
--- a/lisp/gnus/gnus-art.el
+++ b/lisp/gnus/gnus-art.el
@@ -814,6 +814,7 @@ When nil (the default value), then some MIME parts do not get buttons,
 as described by the variables `gnus-buttonized-mime-types' and
 `gnus-unbuttonized-mime-types'."
   :version "22.1"
+  :group 'gnus-article-mime
   :type 'boolean)
 
 (defcustom gnus-body-boundary-delimiter "_"
diff --git a/lisp/gnus/gnus-cite.el b/lisp/gnus/gnus-cite.el
index e60ea32e126..6053b2ae502 100644
--- a/lisp/gnus/gnus-cite.el
+++ b/lisp/gnus/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
@@ -138,7 +139,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.
@@ -155,7 +157,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))
@@ -165,7 +168,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))
@@ -175,7 +179,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))
@@ -185,7 +190,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))
@@ -195,7 +201,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))
@@ -205,7 +212,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))
@@ -215,7 +223,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))
@@ -225,7 +234,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))
@@ -235,7 +245,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))
@@ -245,7 +256,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))
@@ -255,7 +267,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/gnus-diary.el b/lisp/gnus/gnus-diary.el
index 093f4bd7806..c34c3b6df88 100644
--- a/lisp/gnus/gnus-diary.el
+++ b/lisp/gnus/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 <didier@xemacs.org>
@@ -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/gnus.el b/lisp/gnus/gnus.el
index 98c41de45e5..a134ac661ac 100644
--- a/lisp/gnus/gnus.el
+++ b/lisp/gnus/gnus.el
@@ -366,7 +366,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)
@@ -377,7 +378,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)
@@ -388,7 +390,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)
@@ -399,7 +402,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)
@@ -410,7 +414,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)
@@ -421,7 +426,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)
@@ -432,7 +438,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)
@@ -443,7 +450,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)
@@ -454,7 +462,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)
@@ -465,7 +474,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)
@@ -476,7 +486,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)
@@ -487,7 +498,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)
@@ -498,7 +510,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)
@@ -509,7 +522,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)
@@ -520,7 +534,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)
@@ -531,7 +546,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)
@@ -542,7 +558,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)
@@ -553,7 +570,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)
@@ -564,7 +582,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)
@@ -575,7 +594,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)
@@ -586,7 +606,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)
@@ -597,18 +618,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)
@@ -619,7 +643,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)
@@ -630,7 +655,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)
@@ -641,7 +667,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)
@@ -652,7 +679,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)
@@ -663,7 +691,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)
@@ -674,7 +703,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)
@@ -683,7 +713,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)
@@ -692,7 +723,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)
@@ -701,22 +733,26 @@ 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-high-read-face
   '((((class color)
@@ -729,7 +765,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 +779,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 +791,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 +845,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/gnus/message.el b/lisp/gnus/message.el
index c07b6c34d3c..eaac4e390a9 100644
--- a/lisp/gnus/message.el
+++ b/lisp/gnus/message.el
@@ -842,7 +842,8 @@ the signature is inserted."
     (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/gnus/sieve-manage.el b/lisp/gnus/sieve-manage.el
index 5b7ef9a99fb..d43808d788a 100644
--- a/lisp/gnus/sieve-manage.el
+++ b/lisp/gnus/sieve-manage.el
@@ -86,22 +86,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)
@@ -113,10 +118,12 @@
 
 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 '(cram-md5 plain)
-  "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)
@@ -127,11 +134,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/gnus/sieve-mode.el b/lisp/gnus/sieve-mode.el
index e303e8e70b5..c4d019da6df 100644
--- a/lisp/gnus/sieve-mode.el
+++ b/lisp/gnus/sieve-mode.el
@@ -1,5 +1,5 @@
 ;;; sieve-mode.el --- Sieve code editing commands for Emacs
-;; Copyright (C) 2001, 2003 Free Software Foundation, Inc.
+;; Copyright (C) 2001, 2002, 2003, 2005 Free Software Foundation, Inc.
 
 ;; Author: Simon Josefsson <simon@josefsson.org>
 
@@ -75,7 +75,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.")
@@ -85,7 +86,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.")
@@ -99,7 +101,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.")
@@ -111,7 +114,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/gnus/smime.el b/lisp/gnus/smime.el
index cd921719045..399c0678c41 100644
--- a/lisp/gnus/smime.el
+++ b/lisp/gnus/smime.el
@@ -122,7 +122,8 @@
 (eval-when-compile (require 'cl))
 
 (defgroup smime nil
-  "S/MIME configuration.")
+  "S/MIME configuration."
+  :group 'mime)
 
 (defcustom smime-keys nil
   "*Map mail addresses to a file containing Certificate (and private key).
diff --git a/lisp/gnus/spam-report.el b/lisp/gnus/spam-report.el
index 59119dc5438..e988199755d 100644
--- a/lisp/gnus/spam-report.el
+++ b/lisp/gnus/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 <tzz@lifelogs.com>
 ;; 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/gnus/spam.el b/lisp/gnus/spam.el
index e36bf8b26c8..5e73c2deb2e 100644
--- a/lisp/gnus/spam.el
+++ b/lisp/gnus/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 <larsi@gnus.org>
 ;; Keywords: network
@@ -77,7 +77,9 @@
 
 (defgroup spam nil
   "Spam configuration."
-  :version "22.1")
+  :version "22.1"
+  :group 'mail
+  :group 'news)
 
 (defcustom spam-directory (nnheader-concat gnus-directory "spam/")
   "Directory for spam whitelists and blacklists."
@@ -308,7 +310,8 @@ All unmarked article in such group receive the spam mark on group entry."
     (((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."