diff options
author | Miles Bader <miles@gnu.org> | 2005-02-06 11:56:41 +0000 |
---|---|---|
committer | Miles Bader <miles@gnu.org> | 2005-02-06 11:56:41 +0000 |
commit | 56c30d721096a64f151f9ea6e3c76562380da895 (patch) | |
tree | 713b23a1d067232db4964260299c2ed185c2b65c /lisp/gnus | |
parent | ba2c991c3be7940b8c4a8768e5e369da2276e394 (diff) | |
download | emacs-56c30d721096a64f151f9ea6e3c76562380da895.tar.gz |
Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-82
Merge from gnus--rel--5.10
Patches applied:
* miles@gnu.org--gnu-2005/gnus--rel--5.10--patch-12
Merge from emacs--cvs-trunk--0
* miles@gnu.org--gnu-2005/gnus--rel--5.10--patch-13
Update from CVS
2005-02-03 Katsumi Yamaoka <yamaoka@jpl.org>
* lisp/gnus/gnus-art.el (gnus-mime-inline-part): Show the raw contents if a
prefix arg is neither nil nor a number, as info specifies.
Diffstat (limited to 'lisp/gnus')
-rw-r--r-- | lisp/gnus/ChangeLog | 5 | ||||
-rw-r--r-- | lisp/gnus/gnus-art.el | 11 |
2 files changed, 15 insertions, 1 deletions
diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog index eb761d10b27..e0db7c194a7 100644 --- a/lisp/gnus/ChangeLog +++ b/lisp/gnus/ChangeLog @@ -1,3 +1,8 @@ +2005-02-03 Katsumi Yamaoka <yamaoka@jpl.org> + + * gnus-art.el (gnus-mime-inline-part): Show the raw contents if a + prefix arg is neither nil nor a number, as info specifies. + 2005-01-30 Stefan Monnier <monnier@iro.umontreal.ca> * gnus-art.el (gnus-article-mode): Turn off the "\ " non-break space. diff --git a/lisp/gnus/gnus-art.el b/lisp/gnus/gnus-art.el index 3f8e172c1a8..22d48c3eff0 100644 --- a/lisp/gnus/gnus-art.el +++ b/lisp/gnus/gnus-art.el @@ -4354,7 +4354,16 @@ are decompressed." (setq charset (or (cdr (assq arg gnus-summary-show-article-charset-alist)) - (mm-read-coding-system "Charset: "))))) + (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 ""))))) (forward-line 2) (mm-insert-inline handle (if (and charset |