X-Git-Url: http://git.chise.org/gitweb/?a=blobdiff_plain;f=mime-w3.el;h=6ce9927fbdb8cb8d8552c97f1c4193a7106cf6f6;hb=refs%2Fheads%2Fakemi;hp=a3d3349c9511341b1184b1d3147e1f37f3f4378d;hpb=cc0a722ec13e11cd7aa00db6929cb2505d1c9556;p=elisp%2Fsemi.git

diff --git a/mime-w3.el b/mime-w3.el
index a3d3349..6ce9927 100644
--- a/mime-w3.el
+++ b/mime-w3.el
@@ -1,6 +1,6 @@
 ;;; mime-w3.el --- mime-view content filter for text
 
-;; Copyright (C) 1994,1995,1996,1997,1998 Free Software Foundation, Inc.
+;; Copyright (C) 1994,1995,1996,1997,1998,1999 Free Software Foundation, Inc.
 
 ;; Author: MORIOKA Tomohiko <morioka@jaist.ac.jp>
 ;; Keywords: HTML, MIME, multimedia, mail, news
@@ -43,7 +43,12 @@
 	   ))
     (cons 'progn body)))
 
+(defvar mime-w3-message-structure nil)
+
 (defun mime-preview-text/html (entity situation)
+  (setq mime-w3-message-structure
+	(with-current-buffer (mime-entity-buffer entity)
+	  mime-message-structure))
   (goto-char (point-max))
   (let ((p (point)))
     (insert "\n")
@@ -53,10 +58,25 @@
        (narrow-to-region p p)
        (mime-insert-text-content entity)
        (run-hooks 'mime-text-decode-hook)
-       (w3-region p (point-max))
+       (condition-case err
+	   (w3-region p (point-max))
+	 (error (message (format "%s" err))))
        (mime-put-keymap-region p (point-max) w3-mode-map)
        ))))
 
+(defun url-cid (url &optional proxy-info)
+  (let ((entity
+	 (mime-find-entity-from-content-id (mime-uri-parse-cid url)
+					   mime-w3-message-structure)))
+    (when entity
+      (mime-insert-entity-content entity)
+      (setq url-current-mime-type (mime-entity-type/subtype entity))
+      )))
+
+(url-register-protocol "cid"
+		       'url-cid
+		       'url-identity-expander)
+
 
 ;;; @ end
 ;;;