# HG changeset patch
# User Miles Bader <miles@gnu.org>
# Date 1107691001 0
# Node ID 0b36e2f36bf58a76eb07048bee779fdb181067d2
# Parent  c48813f32e6b2ced32afeb320a346f619e4ba568
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.

diff -r c48813f32e6b -r 0b36e2f36bf5 lisp/gnus/ChangeLog
--- a/lisp/gnus/ChangeLog	Sun Feb 06 11:24:11 2005 +0000
+++ b/lisp/gnus/ChangeLog	Sun Feb 06 11:56:41 2005 +0000
@@ -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 -r c48813f32e6b -r 0b36e2f36bf5 lisp/gnus/gnus-art.el
--- a/lisp/gnus/gnus-art.el	Sun Feb 06 11:24:11 2005 +0000
+++ b/lisp/gnus/gnus-art.el	Sun Feb 06 11:56:41 2005 +0000
@@ -4354,7 +4354,16 @@
 	  (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