X-Git-Url: http://git.chise.org/gitweb/?a=blobdiff_plain;f=lisp%2Fmm-view.el;h=c2131a709974118dd1a0833030897fb9410446e0;hb=b262bef547f95eb63f881897f2f0486e0093f065;hp=8be860364c2d6091823f6a7c523b6d57d7ce0f61;hpb=f0e38408ebe4249827e9fc21cdf1556a636966d3;p=elisp%2Fgnus.git-

diff --git a/lisp/mm-view.el b/lisp/mm-view.el
index 8be8603..c2131a7 100644
--- a/lisp/mm-view.el
+++ b/lisp/mm-view.el
@@ -33,14 +33,25 @@
   (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
 ;;;
 
 (defun mm-inline-image (handle)
-  (let ((annot (make-annotation (mm-get-image handle) nil 'text))
+  (let ((b (point))
+	(annot (make-annotation (mm-get-image handle) nil 'text))
 	buffer-read-only)
-    (mm-insert-inline handle "\n")
+    (insert "\n")
+    (mm-handle-set-undisplayer
+     handle
+     `(lambda ()
+	(let (buffer-read-only)
+	  (delete-annotation ,annot)
+	  (delete-region ,(set-marker (make-marker) b)
+			 ,(set-marker (make-marker) (point))))))
     (set-extent-property annot 'mm t)
     (set-extent-property annot 'duplicable t)))
 
@@ -55,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")
@@ -73,28 +84,34 @@
 	  (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 (re-search-forward
+		     w3-meta-content-type-charset-regexp nil t)
+		    (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) 
 				(match-end 2)))))
-	    (mm-decode-body charset)
+	    (delete-region (point-min) (point-max))
+	    (insert (mm-decode-string text charset))
 	    (save-window-excursion
-	      (let ((w3-strict-width width)
-		    (url-standalone-mode t))
-		(w3-region (point-min) (point-max)))))
-	  (narrow-to-region (1+ (point-min)) (point-max))
-	  (mm-handle-set-undisplayer
-	   handle
-	   `(lambda ()
-	      (let (buffer-read-only)
-		(mapc (lambda (prop)
-			(remove-specifier
-			 (face-property 'default prop) (current-buffer)))
-			'(background background-pixmap foreground))
-		(delete-region ,(point-min-marker)
-			       ,(point-max-marker))))))))
+	      (save-restriction
+		(let ((w3-strict-width width)
+		      (url-standalone-mode t))
+		  (condition-case var
+		      (w3-region (point-min) (point-max))
+		    (error)))))
+	    (mm-handle-set-undisplayer
+	     handle
+	     `(lambda ()
+		(let (buffer-read-only)
+		  (if (functionp 'remove-specifier)
+		      (mapc (lambda (prop)
+			      (remove-specifier
+			       (face-property 'default prop) (current-buffer)))
+			    '(background background-pixmap foreground)))
+		  (delete-region ,(point-min-marker)
+				 ,(point-max-marker)))))))))
      ((or (equal type "enriched")
 	  (equal type "richtext"))
       (save-excursion
@@ -157,21 +174,29 @@
   (goto-char (point-min)))
 
 (defun mm-inline-message (handle)
-  (let ((b (point)))
+  (let ((b (point))
+	gnus-displaying-mime handles)
     (save-excursion
       (save-restriction
 	(narrow-to-region b b)
 	(mm-insert-part handle)
-	(run-hooks 'gnus-article-decode-hook)
-	(gnus-article-prepare-display)
+	(let (gnus-article-mime-handles)
+	  (run-hooks 'gnus-article-decode-hook)
+	  (gnus-article-prepare-display)
+	  (setq handles gnus-article-mime-handles))
+	(when handles
+	  (setq gnus-article-mime-handles
+		(append gnus-article-mime-handles handles)))
 	(mm-handle-set-undisplayer
 	 handle
 	 `(lambda ()
 	    (let (buffer-read-only)
-	      (mapc (lambda (prop)
-		      (remove-specifier
-		       (face-property 'default prop) (current-buffer)))
-		    '(background background-pixmap foreground))
+	      (ignore-errors
+		;; This is only valid on XEmacs.
+		(mapc (lambda (prop)
+			(remove-specifier
+			 (face-property 'default prop) (current-buffer)))
+		      '(background background-pixmap foreground)))
 	      (delete-region ,(point-min-marker) ,(point-max-marker)))))))))
 
 (provide 'mm-view)