1
0
mirror of https://git.savannah.gnu.org/git/emacs.git synced 2025-01-06 11:55:48 +00:00

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
This commit is contained in:
Miles Bader 2006-10-03 04:58:52 +00:00
parent 151fe029c3
commit 670992917f
6 changed files with 21 additions and 4 deletions

View File

@ -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> 2006-09-25 Chong Yidong <cyd@stupidchicken.com>
* gnus-demon.el (gnus-demon): Use with-local-quit to avoid hangs. * gnus-demon.el (gnus-demon): Use with-local-quit to avoid hangs.

View File

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

View File

@ -76,7 +76,6 @@
(when (gnus-visual-p 'draft-menu 'menu) (when (gnus-visual-p 'draft-menu 'menu)
(gnus-draft-make-menu-bar)) (gnus-draft-make-menu-bar))
(gnus-add-minor-mode 'gnus-draft-mode " Draft" gnus-draft-mode-map) (gnus-add-minor-mode 'gnus-draft-mode " Draft" gnus-draft-mode-map)
(mml-mode)
(gnus-run-hooks 'gnus-draft-mode-hook)))) (gnus-run-hooks 'gnus-draft-mode-hook))))
;;; Commands ;;; Commands

View File

@ -253,7 +253,7 @@ superset of iso-8859-1."
:tag "Other options" :tag "Other options"
(cons (symbol :tag "From charset") (cons (symbol :tag "From charset")
(symbol :tag "To charset")))) (symbol :tag "To charset"))))
:version "23.0" ;; No Gnus :version "22.1" ;; Gnus 5.10.9
:group 'mime) :group 'mime)
(defcustom mm-charset-eval-alist (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 evaluated. This allows to load additional libraries providing
charsets on demand. If supported by your Emacs version, you charsets on demand. If supported by your Emacs version, you
could use `autoload-coding-system' here." could use `autoload-coding-system' here."
:version "23.0" ;; No Gnus :version "22.1" ;; Gnus 5.10.9
:type '(list (set :inline t :type '(list (set :inline t
(const (windows-1250 . (mm-codepage-setup 1250 t))) (const (windows-1250 . (mm-codepage-setup 1250 t)))
(const (windows-1251 . (mm-codepage-setup 1251 t))) (const (windows-1251 . (mm-codepage-setup 1251 t)))

View File

@ -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> 2006-10-01 Karl Berry <karl@gnu.org>
* custom.texi (Customization Groups): page break to keep example buffer * custom.texi (Customization Groups): page break to keep example buffer

View File

@ -2495,6 +2495,10 @@ special-purpose groups. All these commands insert the newly created
groups under point---@code{gnus-subscribe-newsgroup-method} is not groups under point---@code{gnus-subscribe-newsgroup-method} is not
consulted. 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 @table @kbd
@item G m @item G m