# HG changeset patch
# User Katsumi Yamaoka <yamaoka@jpl.org>
# Date 1295652826 0
# Node ID e80422318be49bde0b213b9298fbc172911aa857
# Parent  c729a73f3e52648a5dbef5747116eff562318711
gnus-art.el (gnus-mime-display-single): Use mm-display-inline rather than mm-insert-inline.

diff -r c729a73f3e52 -r e80422318be4 lisp/gnus/ChangeLog
--- a/lisp/gnus/ChangeLog	Fri Jan 21 12:24:31 2011 -0800
+++ b/lisp/gnus/ChangeLog	Fri Jan 21 23:33:46 2011 +0000
@@ -3,6 +3,11 @@
 	* gnus-art.el (gnus-button-alist, gnus-button-handle-info-keystrokes):
 	Don't confuse the "ret" of "retrograde" with RET.
 
+2011-01-21  Julien Danjou  <julien@danjou.info>
+
+	* gnus-art.el (gnus-mime-display-single): Use mm-display-inline rather
+	than mm-insert-inline.
+
 2011-01-21  Katsumi Yamaoka  <yamaoka@jpl.org>
 
 	* gnus-art.el (gnus-article-remove-images, gnus-article-show-images):
diff -r c729a73f3e52 -r e80422318be4 lisp/gnus/gnus-art.el
--- a/lisp/gnus/gnus-art.el	Fri Jan 21 12:24:31 2011 -0800
+++ b/lisp/gnus/gnus-art.el	Fri Jan 21 23:33:46 2011 +0000
@@ -5897,18 +5897,7 @@
 	      (forward-line -1)
 	      (setq beg (point)))
 	    (gnus-article-insert-newline)
-	    (mm-insert-inline
-	     handle
-	     (let ((charset (or (mail-content-type-get (mm-handle-type handle)
-						       'charset)
-				(and (equal type "text/calendar") 'utf-8))))
-	       (cond ((not charset)
-		      (mm-string-as-multibyte (mm-get-part handle)))
-		     ((eq charset 'gnus-decoded)
-		      (with-current-buffer (mm-handle-buffer handle)
-			(buffer-string)))
-		     (t
-		      (mm-decode-string (mm-get-part handle) charset)))))
+	    (mm-display-inline handle)
 	    (goto-char (point-max))))
 	  ;; Do highlighting.
 	  (save-excursion