X-Git-Url: http://git.chise.org/gitweb/?a=blobdiff_plain;f=lisp%2Fmm-view.el;h=f5651f4a5f0b1d62c7f752bec598b84fbc768a94;hb=6c1cc3f8b3cb1cd33a6d8fd658721714f2310503;hp=9f3d0e9e840602e0547f822e8467af73dc5304be;hpb=c3e1fa9581a5bfd59386b25a438fbb6650441f79;p=elisp%2Fgnus.git-

diff --git a/lisp/mm-view.el b/lisp/mm-view.el
index 9f3d0e9..f5651f4 100644
--- a/lisp/mm-view.el
+++ b/lisp/mm-view.el
@@ -33,6 +33,9 @@
   (autoload 'vcard-parse-string "vcard")
   (autoload 'vcard-format-string "vcard"))
 
+;; Avoid byte compile warning.
+(defvar gnus-article-mime-handles)
+
 ;;;
 ;;; Functions for displaying various formats inline
 ;;;
@@ -63,7 +66,7 @@
     (setq mm-w3-setup t)))
 
 (defun mm-inline-text (handle)
-  (let ((type (cadr (split-string (car (mm-handle-type handle)) "/")))
+  (let ((type (mm-handle-media-subtype handle))
 	text buffer-read-only)
     (cond
      ((equal type "html")
@@ -81,10 +84,12 @@
 	  (save-restriction
 	    (narrow-to-region b (point))
 	    (goto-char (point-min))
-	    (if (or (re-search-forward
-		     w3-meta-content-type-charset-regexp nil t)
-		    (re-search-forward
-		     w3-meta-charset-content-type-regexp nil t))
+	    (if (or (and (boundp 'w3-meta-content-type-charset-regexp)
+			 (re-search-forward
+			  w3-meta-content-type-charset-regexp nil t))
+		    (and (boundp 'w3-meta-charset-content-type-regexp)
+			 (re-search-forward
+			  w3-meta-charset-content-type-regexp nil t)))
 		(setq charset (w3-coding-system-for-mime-charset 
 			       (buffer-substring-no-properties 
 				(match-beginning 2) 
@@ -183,7 +188,9 @@
 	  (setq handles gnus-article-mime-handles))
 	(when handles
 	  (setq gnus-article-mime-handles
-		(append gnus-article-mime-handles handles)))
+		(nconc gnus-article-mime-handles 
+		       (if (listp (car handles)) 
+			   handles (list handles)))))
 	(mm-handle-set-undisplayer
 	 handle
 	 `(lambda ()