X-Git-Url: http://git.chise.org/gitweb/?a=blobdiff_plain;f=lisp%2Fmm-view.el;h=9c2018492cb68197f61fd5eadb8fd5aad7902f96;hb=7554e4249c821770633b5aea99298d92bf1e5b5d;hp=64abdc35079843cdea18623db2a3164d504359a3;hpb=8b1305ac117e83bf50d4b562b2a839a627ce50e3;p=elisp%2Fgnus.git-

diff --git a/lisp/mm-view.el b/lisp/mm-view.el
index 64abdc3..9c20184 100644
--- a/lisp/mm-view.el
+++ b/lisp/mm-view.el
@@ -1,5 +1,5 @@
 ;;; mm-view.el --- Functions for viewing MIME objects
-;; Copyright (C) 1998 Free Software Foundation, Inc.
+;; Copyright (C) 1998,99 Free Software Foundation, Inc.
 
 ;; Author: Lars Magne Ingebrigtsen <larsi@gnus.org>
 ;; This file is part of GNU Emacs.
@@ -28,6 +28,11 @@
 (require 'mm-bodies)
 (require 'mm-decode)
 
+(eval-and-compile
+  (autoload 'gnus-article-prepare-display "gnus-art")
+  (autoload 'vcard-parse-string "vcard")
+  (autoload 'vcard-format-string "vcard"))
+
 ;;;
 ;;; Functions for displaying various formats inline
 ;;;
@@ -35,51 +40,39 @@
 (defun mm-inline-image (handle)
   (let ((annot (make-annotation (mm-get-image handle) nil 'text))
 	buffer-read-only)
-    (mm-insert-inline handle ".\n")
+    (mm-insert-inline handle "\n")
     (set-extent-property annot 'mm t)
     (set-extent-property annot 'duplicable t)))
 
 (defvar mm-w3-setup nil)
 (defun mm-setup-w3 ()
   (unless mm-w3-setup
+    (require 'w3)
     (w3-do-setup)
     (require 'url)
     (require 'w3-vars)
-    (condition-case ()
-	(load "url-misc.el")
-      (error nil))
+    (require 'url-vars)
     (setq mm-w3-setup t)))
 
 (defun mm-inline-text (handle)
   (let ((type (cadr (split-string (car (mm-handle-type handle)) "/")))
 	text buffer-read-only)
     (cond
-     ((equal type "plain")
-      (setq text (mm-get-part handle))
-      (let ((b (point))
-	    (charset (mail-content-type-get
-		      (mm-handle-type handle) 'charset)))
-	(insert (mm-decode-string text charset))
-	(save-restriction
-	  (narrow-to-region b (point))
-	  (mm-handle-set-undisplayer
-	   handle
-	   `(lambda ()
-	      (let (buffer-read-only)
-		(delete-region
-		 ,(set-marker (make-marker) (point-min))
-		 ,(set-marker (make-marker) (point-max)))))))))
      ((equal type "html")
       (mm-setup-w3)
       (setq text (mm-get-part handle))
       (let ((b (point))
+	    (url-standalone-mode t)
+	    (url-current-object
+	     (url-generic-parse-url (format "cid:%s" (mm-handle-id handle))))
 	    (width (window-width)))
 	(save-excursion
 	  (insert text)
 	  (save-restriction
 	    (narrow-to-region b (point))
 	    (save-window-excursion
-	      (let ((w3-strict-width width))
+	      (let ((w3-strict-width width)
+		    (url-standalone-mode t))
 		(w3-region (point-min) (point-max)))))
 	  (mm-handle-set-undisplayer
 	   handle
@@ -89,30 +82,38 @@
 		      (remove-specifier
 		       (face-property 'default prop) (current-buffer)))
                     '(background background-pixmap foreground))
-		(delete-region
-		 ,(set-marker (make-marker) (point-min))
-		 ,(set-marker (make-marker) (point-max)))))))))
+		(delete-region ,(point-min-marker) ,(point-max-marker))))))))
      ((or (equal type "enriched")
 	  (equal type "richtext"))
       (save-excursion
 	(mm-with-unibyte-buffer
-	  (insert-buffer-substring (mm-handle-buffer handle))
-	  (mm-decode-content-transfer-encoding
-	   (mm-handle-encoding handle)
-	   (car (mm-handle-type handle)))
+	  (mm-insert-part handle)
 	  (save-window-excursion
 	    (enriched-decode (point-min) (point-max))
 	    (setq text (buffer-string)))))
       (mm-insert-inline handle text))
+     ((equal type "x-vcard")
+      (mm-insert-inline
+       handle
+       (concat "\n-- \n"
+	       (vcard-format-string
+		(vcard-parse-string (mm-get-part handle)
+				    'vcard-standard-filter)))))
      (t
-      (save-excursion
-	(mm-with-unibyte-buffer
-	  (insert-buffer-substring (mm-handle-buffer handle))
-	  (mm-decode-content-transfer-encoding
-	   (mm-handle-encoding handle)
-	   (car (mm-handle-type handle)))
-	  (setq text (buffer-string))))
-      (mm-insert-inline handle text)))))
+      (setq text (mm-get-part handle))
+      (let ((b (point))
+	    (charset (mail-content-type-get
+		      (mm-handle-type handle) 'charset)))
+	(insert (mm-decode-string text charset))
+	(save-restriction
+	  (narrow-to-region b (point))
+	  (set-text-properties (point-min) (point-max) nil)
+	  (mm-handle-set-undisplayer
+	   handle
+	   `(lambda ()
+	      (let (buffer-read-only)
+		(delete-region ,(point-min-marker)
+			       ,(point-max-marker)))))))))))
 
 (defun mm-insert-inline (handle text)
   "Insert TEXT inline from HANDLE."
@@ -124,7 +125,7 @@
 	(let (buffer-read-only)
 	  (delete-region ,(set-marker (make-marker) b)
 			 ,(set-marker (make-marker) (point))))))))
-  
+
 (defun mm-inline-audio (handle)
   (message "Not implemented"))
 
@@ -133,7 +134,33 @@
 
 (defun mm-w3-prepare-buffer ()
   (require 'w3)
-  (w3-prepare-buffer))
+  (let ((url-standalone-mode t))
+    (w3-prepare-buffer)))
+
+(defun mm-view-message ()
+  (mm-enable-multibyte)
+  (gnus-article-prepare-display)
+  (run-hooks 'gnus-article-decode-hook)
+  (fundamental-mode)
+  (goto-char (point-min)))
+
+(defun mm-inline-message (handle)
+  (let ((b (point)))
+    (save-excursion
+      (mm-insert-part handle)
+      (save-restriction
+	(narrow-to-region b (point))
+	(run-hooks 'gnus-article-decode-hook)
+	(gnus-article-prepare-display)
+	(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)))))))))
 
 (provide 'mm-view)