X-Git-Url: http://git.chise.org/gitweb/?a=blobdiff_plain;f=lisp%2Fmm-view.el;h=5c7a56ecf43d9c8a8956966ff81157cd1d834019;hb=09868cf7efbfa51562d76580eafc9a7b6b0c8d72;hp=a693aaae64e0530db86034d1d843e355cc31133d;hpb=b008f17a2c9cff5c7c0b0c669d54aba93c561a23;p=elisp%2Fgnus.git-

diff --git a/lisp/mm-view.el b/lisp/mm-view.el
index a693aaa..5c7a56e 100644
--- a/lisp/mm-view.el
+++ b/lisp/mm-view.el
@@ -38,9 +38,17 @@
 ;;;
 
 (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)))
 
@@ -65,23 +73,43 @@
 	    (url-standalone-mode t)
 	    (url-current-object
 	     (url-generic-parse-url (format "cid:%s" (mm-handle-id handle))))
-	    (width (window-width)))
+	    (width (window-width))
+	    (charset (mail-content-type-get
+		      (mm-handle-type handle) 'charset)))
 	(save-excursion
 	  (insert text)
 	  (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))
+		(setq charset (w3-coding-system-for-mime-charset 
+			       (buffer-substring-no-properties 
+				(match-beginning 2) 
+				(match-end 2)))))
+	    (delete-region (point-min) (point-max))
+	    (insert (mm-decode-string text charset))
 	    (save-window-excursion
-	      (let ((w3-strict-width width))
-		(w3-region (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)))))
+;;;	    (narrow-to-region (1+ (point-min)) (point-max))
+	    (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
@@ -133,14 +161,39 @@
 
 (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)) gnus-displaying-mime handles)
+    (save-excursion
+      (save-restriction
+	(narrow-to-region b b)
+	(mm-insert-part handle)
+	(let (gnus-article-mime-handles)
+	  (run-hooks 'gnus-article-decode-hook)
+	  (gnus-article-prepare-display)
+	  (setq handles gnus-article-mime-handles))
+	(if 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))
+	      (delete-region ,(point-min-marker) ,(point-max-marker)))))))))
+
 (provide 'mm-view)
 
 ;; mm-view.el ends here