Merge from gnus--rel--5.10

Patches applied:

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

   - Merge from emacs--devo--0
   - Update from CVS

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

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

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

   * lisp/gnus/gnus-draft.el (gnus-draft-mode): Don't call `mml-mode'.

2006-10-02  Reiner Steib  <Reiner.Steib@gmx.de>

   * man/gnus.texi (Foreign Groups): Say where change of editing commands are
   stored.  Add reference to `gnus-parameters'.

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

diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog
index 4c85beccd0376784ce08f5fd8e90da3b8efb6da7..ad3c6ad919ee01c2d42ede0a6c36709d074e5f9f 100644 (file)
--- a/lisp/gnus/ChangeLog
+++ b/lisp/gnus/ChangeLog
@@ -1,3 +1,12 @@
+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-25  Chong Yidong  <cyd@stupidchicken.com>
 
        * gnus-demon.el (gnus-demon): Use with-local-quit to avoid hangs.

diff --git a/lisp/gnus/gmm-utils.el b/lisp/gnus/gmm-utils.el
index f314d0e81d7d309c1c7c9ac44138ad3066f7f738..e773aa3bfac5f9570e5dca8e4bc4976c777d1f08 100644 (file)
--- a/lisp/gnus/gmm-utils.el
+++ b/lisp/gnus/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/gnus/gnus-draft.el b/lisp/gnus/gnus-draft.el
index 125e5bebd493613800171b07ad8122dc3bb40694..013be4106327a764e64005efa85d4f43483cd493 100644 (file)
--- a/lisp/gnus/gnus-draft.el
+++ b/lisp/gnus/gnus-draft.el
@@ -76,7 +76,6 @@
       (when (gnus-visual-p 'draft-menu 'menu)
        (gnus-draft-make-menu-bar))
       (gnus-add-minor-mode 'gnus-draft-mode " Draft" gnus-draft-mode-map)
-      (mml-mode)
       (gnus-run-hooks 'gnus-draft-mode-hook))))
 
 ;;; Commands

diff --git a/lisp/gnus/mm-util.el b/lisp/gnus/mm-util.el
index 26a1bf23e8464d5de6ca36bab8824979e692d744..1c9f9749f858e2e78442cced3adda08ef8752680 100644 (file)
--- a/lisp/gnus/mm-util.el
+++ b/lisp/gnus/mm-util.el
@@ -253,7 +253,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
@@ -270,7 +270,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)))

diff --git a/man/ChangeLog b/man/ChangeLog
index 0f0de1b7620bd25a6580c6900499e4d9e7dace2a..5eb8e609c6e7ba4643fcec7491f212f803f4796e 100644 (file)
--- a/man/ChangeLog
+++ b/man/ChangeLog
@@ -1,3 +1,8 @@
+2006-10-02  Reiner Steib  <Reiner.Steib@gmx.de>
+
+       * gnus.texi (Foreign Groups): Say where change of editing commands are
+       stored.  Add reference to `gnus-parameters'.
+
 2006-10-01  Karl Berry  <karl@gnu.org>
 
        * custom.texi (Customization Groups): page break to keep example buffer

diff --git a/man/gnus.texi b/man/gnus.texi
index 0e8e9572349f64707af5c5e417de17ff8696a2c8..973ba121f6ff67e4361eef52e7382a9f057d256d 100644 (file)
--- a/man/gnus.texi
+++ b/man/gnus.texi
@@ -2495,6 +2495,10 @@ special-purpose groups.  All these commands insert the newly created
 groups under point---@code{gnus-subscribe-newsgroup-method} is not
 consulted.
 
+Changes from the group editing commands are stored in
+@file{~/.newsrc.eld} (@code{gnus-startup-file}).  An alternative is the
+variable @code{gnus-parameters}, @xref{Group Parameters}.
+
 @table @kbd
 
 @item G m