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

diff --git a/lisp/mm-view.el b/lisp/mm-view.el
index 5c7a56e..a5e5030 100644
--- a/lisp/mm-view.el
+++ b/lisp/mm-view.el
@@ -23,6 +23,7 @@
 
 ;;; Code:
 
+(eval-when-compile (require 'cl))
 (require 'mail-parse)
 (require 'mailcap)
 (require 'mm-bodies)
@@ -31,7 +32,9 @@
 (eval-and-compile
   (autoload 'gnus-article-prepare-display "gnus-art")
   (autoload 'vcard-parse-string "vcard")
-  (autoload 'vcard-format-string "vcard"))
+  (autoload 'vcard-format-string "vcard")
+  (autoload 'fill-flowed "fill-flowed")
+  (autoload 'diff-mode "diff-mode"))
 
 ;;;
 ;;; 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) 
@@ -98,16 +103,16 @@
 		  (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)))
+		      (mapcar (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")
@@ -123,15 +128,25 @@
       (mm-insert-inline
        handle
        (concat "\n-- \n"
-	       (vcard-format-string
-		(vcard-parse-string (mm-get-part handle)
-				    'vcard-standard-filter)))))
+	       (if (fboundp 'vcard-pretty-print)
+		   (vcard-pretty-print (mm-get-part handle))
+		 (vcard-format-string
+		  (vcard-parse-string (mm-get-part handle)
+				      'vcard-standard-filter))))))
      (t
       (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))
+	(when (and (equal type "plain")
+		   (equal (cdr (assoc 'format (mm-handle-type handle)))
+			  "flowed"))
+	  (save-restriction
+	    (narrow-to-region b (point))
+	    (goto-char b)
+	    (fill-flowed)
+	    (goto-char (point-max))))
 	(save-restriction
 	  (narrow-to-region b (point))
 	  (set-text-properties (point-min) (point-max) nil)
@@ -166,34 +181,76 @@
 
 (defun mm-view-message ()
   (mm-enable-multibyte)
-  (gnus-article-prepare-display)
-  (run-hooks 'gnus-article-decode-hook)
+  (let (handles)
+    (let (gnus-article-mime-handles)
+      ;; Double decode problem may happen.  See mm-inline-message.
+      (run-hooks 'gnus-article-decode-hook)
+      (gnus-article-prepare-display)
+      (setq handles gnus-article-mime-handles))
+    (when handles
+      (setq gnus-article-mime-handles
+	    (nconc gnus-article-mime-handles 
+		   (if (listp (car handles)) 
+		       handles (list handles))))))
   (fundamental-mode)
   (goto-char (point-min)))
 
 (defun mm-inline-message (handle)
-  (let ((b (point)) gnus-displaying-mime handles)
+  (let ((b (point))
+	(charset (mail-content-type-get
+		  (mm-handle-type handle) 'charset))
+	gnus-displaying-mime handles)
+    (when (and charset
+	       (stringp charset))
+      (setq charset (intern (downcase charset)))
+      (when (eq charset 'us-ascii)
+	(setq charset nil)))
     (save-excursion
       (save-restriction
 	(narrow-to-region b b)
 	(mm-insert-part handle)
-	(let (gnus-article-mime-handles)
+	(let (gnus-article-mime-handles
+	      (gnus-newsgroup-charset
+	       (or charset gnus-newsgroup-charset)))
 	  (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)))
+	(goto-char (point-max))
+	(unless (bolp)
+	  (insert "\n"))
+	(insert "----------\n\n")
+	(when handles
+	  (setq gnus-article-mime-handles
+		(nconc gnus-article-mime-handles 
+		       (if (listp (car handles)) 
+			   handles (list 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))
+	      (condition-case nil
+		  ;; This is only valid on XEmacs.
+		  (mapcar (lambda (prop)
+			    (remove-specifier
+			     (face-property 'default prop) (current-buffer)))
+			  '(background background-pixmap foreground))
+		(error nil))
 	      (delete-region ,(point-min-marker) ,(point-max-marker)))))))))
 
+(defun mm-display-patch-inline (handle)
+  (let (text)
+    (with-temp-buffer
+      (mm-insert-part handle)
+      (diff-mode)
+      (font-lock-fontify-buffer)
+      (when (fboundp 'extent-list)
+	(map-extents (lambda (ext ignored)
+		       (set-extent-property ext 'duplicable t)
+		       nil)
+		     nil nil nil nil nil 'text-prop))
+      (setq text (buffer-string)))
+    (mm-insert-inline handle text)))
+
 (provide 'mm-view)
 
 ;; mm-view.el ends here