Mercurial > emacs
diff lisp/gnus/gnus-art.el @ 61537:18b52f2ea5dc
Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-256
Merge from gnus--rel--5.10
Patches applied:
* gnus--rel--5.10 (patch 65)
- Update from CVS
2005-04-13 Katsumi Yamaoka <yamaoka@jpl.org>
* lisp/gnus/gnus-art.el (gnus-mime-inline-part): Use mm-string-to-multibyte.
* lisp/gnus/qp.el (quoted-printable-encode-region): Use mm-string-to-multibyte.
| author | Miles Bader <miles@gnu.org> |
|---|---|
| date | Wed, 13 Apr 2005 21:38:06 +0000 |
| parents | f5e70b5f16ce |
| children | d1245d218964 146c086df160 |
line wrap: on
line diff
--- a/lisp/gnus/gnus-art.el Wed Apr 13 20:41:10 2005 +0000 +++ b/lisp/gnus/gnus-art.el Wed Apr 13 21:38:06 2005 +0000 @@ -4358,21 +4358,16 @@ (mm-read-coding-system "Charset: ")))) (t (if (mm-handle-undisplayer handle) - (mm-remove-part handle)) - (setq contents - (if (fboundp 'string-to-multibyte) - (string-to-multibyte contents) - (mapconcat - (lambda (ch) (mm-string-as-multibyte (char-to-string ch))) - contents ""))))) + (mm-remove-part handle)))) (forward-line 2) - (mm-insert-inline handle - (if (and charset - (setq charset (mm-charset-to-coding-system - charset)) - (not (eq charset 'ascii))) - (mm-decode-coding-string contents charset) - contents)) + (mm-insert-inline + handle + (if (and charset + (setq charset (mm-charset-to-coding-system + charset)) + (not (eq charset 'ascii))) + (mm-decode-coding-string contents charset) + (mm-string-to-multibyte contents))) (goto-char b))))) (defun gnus-mime-view-part-as-charset (&optional handle arg)