From: Julien Danjou <julien@danjou.info>
Date: Fri, 21 Jan 2011 23:33:46 +0000 (+0000)
Subject: gnus-art.el (gnus-mime-display-single): Use mm-display-inline rather than mm-insert... 
X-Git-Tag: emacs-pretest-24.0.90~104^2~618^2~1322^2~174
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=f205c6e78b18365fef34192a66d139796d051f51;p=emacs.git

gnus-art.el (gnus-mime-display-single): Use mm-display-inline rather than mm-insert-inline.
---

diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog
index 4dba61b833b..807bdc00ebd 100644
--- a/lisp/gnus/ChangeLog
+++ b/lisp/gnus/ChangeLog
@@ -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 --git a/lisp/gnus/gnus-art.el b/lisp/gnus/gnus-art.el
index c0029e74553..430590d9abb 100644
--- a/lisp/gnus/gnus-art.el
+++ b/lisp/gnus/gnus-art.el
@@ -5897,18 +5897,7 @@ If displaying \"text/html\" is discouraged \(see
 	      (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