Merge from gnus--rel--5.10

Patches applied:

 * gnus--rel--5.10  (patch 142-144)

   - Update from CVS

2006-09-28  Reiner Steib  <Reiner.Steib@gmx.de>

   * lisp/gmm-utils.el (gmm): Adjust custom version.

   * lisp/mm-util.el (mm-charset-override-alist, mm-charset-eval-alist): Adjust
   custom version.

Revision: emacs@sv.gnu.org/gnus--devo--0--patch-212

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index ffe6e97..125fb1d 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -25,6 +25,11 @@
 
 2006-09-28  Reiner Steib  <Reiner.Steib@gmx.de>
 
+       * gmm-utils.el (gmm): Adjust custom version.
+
+       * mm-util.el (mm-charset-override-alist, mm-charset-eval-alist): Adjust
+       custom version.
+
        * gnus-draft.el (gnus-draft-mode): Don't call `mml-mode'.
 
 2006-09-27  Reiner Steib  <Reiner.Steib@gmx.de>

diff --git a/lisp/gmm-utils.el b/lisp/gmm-utils.el
index f314d0e..e773aa3 100644 (file)
--- a/lisp/gmm-utils.el
+++ b/lisp/gmm-utils.el
@@ -35,7 +35,7 @@
 (defgroup gmm nil
   "Utility functions for Gnus, Message and MML"
   :prefix "gmm-"
-  :version "23.0" ;; No Gnus
+  :version "22.1" ;; Gnus 5.10.9
   :group 'lisp)
 
 ;; Helper functions from `gnus-utils.el': gmm-verbose, gmm-message, gmm-error

diff --git a/lisp/mm-util.el b/lisp/mm-util.el
index 76dc108..9e8fcd1 100644 (file)
--- a/lisp/mm-util.el
+++ b/lisp/mm-util.el
@@ -250,7 +250,7 @@ superset of iso-8859-1."
                       :tag "Other options"
                       (cons (symbol :tag "From charset")
                             (symbol :tag "To charset"))))
-  :version "23.0" ;; No Gnus
+  :version "22.1" ;; Gnus 5.10.9
   :group 'mime)
 
 (defcustom mm-charset-eval-alist
@@ -267,7 +267,7 @@ If an article is encoded in an unknown CHARSET, FORM is
 evaluated.  This allows to load additional libraries providing
 charsets on demand.  If supported by your Emacs version, you
 could use `autoload-coding-system' here."
-  :version "23.0" ;; No Gnus
+  :version "22.1" ;; Gnus 5.10.9
   :type '(list (set :inline t
                    (const (windows-1250 . (mm-codepage-setup 1250 t)))
                    (const (windows-1251 . (mm-codepage-setup 1251 t)))