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.

1 files changed, 4 insertions, 2 deletions

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\\.\"