From: Miles Bader Date: Tue, 3 Oct 2006 04:58:52 +0000 (+0000) Subject: Merge from gnus--rel--5.10 X-Git-Tag: emacs-pretest-22.0.90~256 X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=670992917f2ee196a667797e4c3806d89c0f6d61;p=emacs.git 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 * 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 * 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 4c85beccd03..ad3c6ad919e 100644 --- a/lisp/gnus/ChangeLog +++ b/lisp/gnus/ChangeLog @@ -1,3 +1,12 @@ +2006-09-28 Reiner Steib + + * 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 * 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 f314d0e81d7..e773aa3bfac 100644 --- 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 125e5bebd49..013be410632 100644 --- 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 26a1bf23e84..1c9f9749f85 100644 --- 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 0f0de1b7620..5eb8e609c6e 100644 --- a/man/ChangeLog +++ b/man/ChangeLog @@ -1,3 +1,8 @@ +2006-10-02 Reiner Steib + + * gnus.texi (Foreign Groups): Say where change of editing commands are + stored. Add reference to `gnus-parameters'. + 2006-10-01 Karl Berry * custom.texi (Customization Groups): page break to keep example buffer diff --git a/man/gnus.texi b/man/gnus.texi index 0e8e9572349..973ba121f6f 100644 --- 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