diff options
author | Miles Bader <miles@gnu.org> | 2005-09-11 22:21:01 +0000 |
---|---|---|
committer | Miles Bader <miles@gnu.org> | 2005-09-11 22:21:01 +0000 |
commit | ff8d296438e69b8cf701d95b6ccd271c416c46fd (patch) | |
tree | 44b388101b40592656ad4c5033aabe2a1ae4b462 /lisp/gnus/gnus-art.el | |
parent | 389cb481135145b80a679beec8cdc8fed75682c5 (diff) | |
parent | a8f6d239d2d541ec874a22000e0542c20fd55a67 (diff) | |
download | emacs-ff8d296438e69b8cf701d95b6ccd271c416c46fd.tar.gz emacs-ff8d296438e69b8cf701d95b6ccd271c416c46fd.tar.bz2 emacs-ff8d296438e69b8cf701d95b6ccd271c416c46fd.zip |
Revision: miles@gnu.org--gnu-2005/emacs--unicode--0--patch-81
Merge from emacs--cvs-trunk--0
Patches applied:
* emacs--cvs-trunk--0 (patch 532-541)
- Update from CVS
- Merge from gnus--rel--5.10
* gnus--rel--5.10 (patch 112-115)
- Update from CVS
Diffstat (limited to 'lisp/gnus/gnus-art.el')
-rw-r--r-- | lisp/gnus/gnus-art.el | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/lisp/gnus/gnus-art.el b/lisp/gnus/gnus-art.el index b07954772d2..3bdc93935bc 100644 --- a/lisp/gnus/gnus-art.el +++ b/lisp/gnus/gnus-art.el @@ -4862,7 +4862,14 @@ If displaying \"text/html\" is discouraged \(see (forward-line -1) (setq beg (point))) (gnus-article-insert-newline) - (mm-insert-inline handle (mm-get-part handle)) + (mm-insert-inline handle + (let ((charset + (mail-content-type-get + (mm-handle-type handle) 'charset))) + (if (eq charset 'gnus-decoded) + (mm-get-part handle) + (mm-decode-string (mm-get-part handle) + charset)))) (goto-char (point-max)))) ;; Do highlighting. (save-excursion |