Revision: miles@gnu.org--gnu-2004/gnus--devo--0--patch-163

Merge from gnus--rel--5.10

Patches applied:

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-621
   Merge from gnus--rel--5.10

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-626
   Merge from gnus--rel--5.10

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-628
   Merge from gnus--rel--5.10

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-631
   Merge from gnus--rel--5.10

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-633
   Merge from gnus--rel--5.10

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-640
   Merge from gnus--rel--5.10

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-650
   Merge from gnus--rel--5.10

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-658
   Merge from gnus--rel--5.10

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-660
   Merge from gnus--rel--5.10

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-668
   Merge from gnus--rel--5.10

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-669
   Update from CVS

 * miles@gnu.org--gnu-2004/gnus--rel--5.10--patch-67
 - miles@gnu.org--gnu-2004/gnus--rel--5.10--patch-68
   Update from CVS

 * miles@gnu.org--gnu-2004/gnus--rel--5.10--patch-69
   Merge from emacs--cvs-trunk--0

2004-11-04  Richard M. Stallman  <rms@gnu.org>

   * lisp/spam.el (spam group): Add :version.

   * lisp/pgg-def.el (pgg group): Add :version.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index e667a86..dcfc0cb 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,9 @@
+2004-11-04  Richard M. Stallman  <rms@gnu.org>
+
+       * spam.el (spam group): Add :version.
+
+       * pgg-def.el (pgg group): Add :version.
+
 2004-11-04  Katsumi Yamaoka  <yamaoka@jpl.org>
 
        * gnus-art. (gnus-article-edit-article): Don't associate the

diff --git a/lisp/pgg-def.el b/lisp/pgg-def.el
index 5ec53ad..0132749 100644 (file)
--- a/lisp/pgg-def.el
+++ b/lisp/pgg-def.el
@@ -27,7 +27,8 @@
 
 (defgroup pgg ()
   "Glue for the various PGP implementations."
-  :group 'mime)
+  :group 'mime
+  :version "21.4")
 
 (defcustom pgg-default-scheme 'gpg
   "Default PGP scheme."

diff --git a/lisp/spam.el b/lisp/spam.el
index fd0e619..f5d4e34 100644 (file)
--- a/lisp/spam.el
+++ b/lisp/spam.el
@@ -79,7 +79,8 @@
 Populated by spam-install-backend-super.")
 
 (defgroup spam nil
-  "Spam configuration.")
+  "Spam configuration."
+  :version "21.4")
 
 (defcustom spam-summary-exit-behavior 'default
   "Exit behavior at the time of summary exit.