diff options
| author | Miles Bader <miles@gnu.org> | 2006-10-03 04:58:52 +0000 |
|---|---|---|
| committer | Miles Bader <miles@gnu.org> | 2006-10-03 04:58:52 +0000 |
| commit | 670992917f2ee196a667797e4c3806d89c0f6d61 (patch) | |
| tree | 97d4a1c6e6392543b32db0c79f779e27050106cf /lisp | |
| parent | 151fe029c35b440f4061e8b8d53781a4cff99201 (diff) | |
| download | emacs-670992917f2ee196a667797e4c3806d89c0f6d61.tar.gz | |
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
Diffstat (limited to 'lisp')
| -rw-r--r-- | lisp/gnus/ChangeLog | 9 | ||||
| -rw-r--r-- | lisp/gnus/gmm-utils.el | 2 | ||||
| -rw-r--r-- | lisp/gnus/gnus-draft.el | 1 | ||||
| -rw-r--r-- | lisp/gnus/mm-util.el | 4 |
4 files changed, 12 insertions, 4 deletions
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 <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 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))) |