# HG changeset patch
# User Miles Bader <miles@gnu.org>
# Date 1159851532 0
# Node ID 36dcde72adadd9e5000a2fffa7b9eb06022fe8b5
# Parent  b1726ccffa0f95255542b7ce623a180230a220b0
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 -r b1726ccffa0f -r 36dcde72adad lisp/gnus/ChangeLog
--- a/lisp/gnus/ChangeLog	Tue Oct 03 00:35:56 2006 +0000
+++ b/lisp/gnus/ChangeLog	Tue Oct 03 04:58:52 2006 +0000
@@ -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 -r b1726ccffa0f -r 36dcde72adad lisp/gnus/gmm-utils.el
--- a/lisp/gnus/gmm-utils.el	Tue Oct 03 00:35:56 2006 +0000
+++ b/lisp/gnus/gmm-utils.el	Tue Oct 03 04:58:52 2006 +0000
@@ -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 -r b1726ccffa0f -r 36dcde72adad lisp/gnus/gnus-draft.el
--- a/lisp/gnus/gnus-draft.el	Tue Oct 03 00:35:56 2006 +0000
+++ b/lisp/gnus/gnus-draft.el	Tue Oct 03 04:58:52 2006 +0000
@@ -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 -r b1726ccffa0f -r 36dcde72adad lisp/gnus/mm-util.el
--- a/lisp/gnus/mm-util.el	Tue Oct 03 00:35:56 2006 +0000
+++ b/lisp/gnus/mm-util.el	Tue Oct 03 04:58:52 2006 +0000
@@ -253,7 +253,7 @@
 		       :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 @@
 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 -r b1726ccffa0f -r 36dcde72adad man/ChangeLog
--- a/man/ChangeLog	Tue Oct 03 00:35:56 2006 +0000
+++ b/man/ChangeLog	Tue Oct 03 04:58:52 2006 +0000
@@ -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 -r b1726ccffa0f -r 36dcde72adad man/gnus.texi
--- a/man/gnus.texi	Tue Oct 03 00:35:56 2006 +0000
+++ b/man/gnus.texi	Tue Oct 03 04:58:52 2006 +0000
@@ -2495,6 +2495,10 @@
 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