Mercurial > emacs
changeset 100454:b8d5bfa98123
Merge from gnus--devo--0
Revision: emacs@sv.gnu.org/emacs--devo--0--patch-1500
| author | Miles Bader <miles@gnu.org> |
|---|---|
| date | Wed, 17 Dec 2008 00:34:16 +0000 |
| parents | 40eb1f585dc7 |
| children | 61a8da68221a |
| files | lisp/gnus/ChangeLog lisp/gnus/gnus-start.el lisp/gnus/mm-util.el lisp/gnus/mml.el |
| diffstat | 4 files changed, 28 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/lisp/gnus/ChangeLog Tue Dec 16 21:23:03 2008 +0000 +++ b/lisp/gnus/ChangeLog Wed Dec 17 00:34:16 2008 +0000 @@ -4,6 +4,19 @@ 2008-12-15 Katsumi Yamaoka <yamaoka@jpl.org> + * mml.el (mml-generate-mime-1): Prefer the MIME charset that Emacs + knows since the charset specified might be a bogus alias that + mm-charset-synonym-alist provides. + +2008-12-15 Reiner Steib <Reiner.Steib@gmx.de> + + * mm-util.el (mm-charset-synonym-alist): Add bogus names "UTF8" and + "ISO_8859-1". + + * gnus-start.el (gnus-backup-startup-file): Improve doc string. + +2008-12-15 Katsumi Yamaoka <yamaoka@jpl.org> + * mm-util.el (mm-charset-eval-alist): Define it before mm-charset-to-coding-system. (mm-charset-to-coding-system): Add optional argument `silent';
--- a/lisp/gnus/gnus-start.el Tue Dec 16 21:23:03 2008 +0000 +++ b/lisp/gnus/gnus-start.el Wed Dec 17 00:34:16 2008 +0000 @@ -50,7 +50,7 @@ :type 'file) (defcustom gnus-backup-startup-file 'never - "Whether to create backup files. + "Control use of version numbers for backups of `gnus-startup-file'. This variable takes the same values as the `version-control' variable." :version "22.1"
--- a/lisp/gnus/mm-util.el Tue Dec 16 21:23:03 2008 +0000 +++ b/lisp/gnus/mm-util.el Wed Dec 17 00:34:16 2008 +0000 @@ -269,10 +269,18 @@ ,@(when (and (not (mm-coding-system-p 'gbk)) (mm-coding-system-p 'cp936)) '((gbk . cp936))) + ;; UTF8 is a bogus name for UTF-8 + ,@(when (and (not (mm-coding-system-p 'utf8)) + (mm-coding-system-p 'utf-8)) + '((utf8 . utf-8))) ;; ISO8859-1 is a bogus name for ISO-8859-1 ,@(when (and (not (mm-coding-system-p 'iso8859-1)) (mm-coding-system-p 'iso-8859-1)) '((iso8859-1 . iso-8859-1))) + ;; ISO_8859-1 is a bogus name for ISO-8859-1 + ,@(when (and (not (mm-coding-system-p 'iso_8859-1)) + (mm-coding-system-p 'iso-8859-1)) + '((iso_8859-1 . iso-8859-1))) ) "A mapping from unknown or invalid charset names to the real charset names.
--- a/lisp/gnus/mml.el Tue Dec 16 21:23:03 2008 +0000 +++ b/lisp/gnus/mml.el Wed Dec 17 00:34:16 2008 +0000 @@ -482,7 +482,12 @@ (setq charset nil coding nil)) (charset - (setq charset (intern (downcase charset))))) + ;; The value of `charset' might be a bogus alias that + ;; `mm-charset-synonym-alist' provides, like `utf8', + ;; so we prefer the MIME charset that Emacs knows for + ;; the coding system `coding'. + (setq charset (or (mm-coding-system-to-mime-charset coding) + (intern (downcase charset)))))) (if (and (not raw) (member (car (split-string type "/")) '("text" "message"))) (progn