X-Git-Url: http://git.chise.org/gitweb/?a=blobdiff_plain;f=tm-view.el;h=9afb5dce90a4057b4d7f4386804c09a873835837;hb=8e18eb1fd95180a6ea115a00ce2f045815809b49;hp=767e49bda8b402eee4d0b48f9f7c87e8ea4594df;hpb=f94c46d394e1304bcc35fee20db5523746cf7a7a;p=elisp%2Ftm.git

diff --git a/tm-view.el b/tm-view.el
index 767e49b..9afb5dc 100644
--- a/tm-view.el
+++ b/tm-view.el
@@ -1,50 +1,48 @@
-;;;
 ;;; tm-view.el --- interactive MIME viewer for GNU Emacs
-;;;
-;;; Copyright (C) 1995 Free Software Foundation, Inc.
-;;; Copyright (C) 1994,1995 MORIOKA Tomohiko
-;;;
-;;; Author: MORIOKA Tomohiko <morioka@jaist.ac.jp>
-;;; modified by Steven L. Baur <steve@miranova.com>
-;;; Maintainer: MORIOKA Tomohiko <morioka@jaist.ac.jp>
-;;; Created: 1994/7/13 (1994/8/31 obsolete tm-body.el)
-;;; Version: $Revision: 7.32.1.2 $
-;;; Keywords: mail, news, MIME, multimedia
-;;;
-;;; This file is part of tm (Tools for MIME).
-;;;
-;;; This program is free software; you can redistribute it and/or
-;;; modify it under the terms of the GNU General Public License as
-;;; published by the Free Software Foundation; either version 2, or
-;;; (at your option) any later version.
-;;;
-;;; This program is distributed in the hope that it will be useful,
-;;; but WITHOUT ANY WARRANTY; without even the implied warranty of
-;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-;;; General Public License for more details.
-;;;
-;;; You should have received a copy of the GNU General Public License
-;;; along with This program.  If not, write to the Free Software
-;;; Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
-;;;
+
+;; Copyright (C) 1995,1996 Free Software Foundation, Inc.
+
+;; Author: MORIOKA Tomohiko <morioka@jaist.ac.jp>
+;; Created: 1994/7/13 (1994/8/31 obsolete tm-body.el)
+;; Version: $Revision: 7.79 $
+;; Keywords: mail, news, MIME, multimedia
+
+;; This file is part of tm (Tools for MIME).
+
+;; This program is free software; you can redistribute it and/or
+;; modify it under the terms of the GNU General Public License as
+;; published by the Free Software Foundation; either version 2, or (at
+;; your option) any later version.
+
+;; This program is distributed in the hope that it will be useful, but
+;; WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+;; General Public License for more details.
+
+;; You should have received a copy of the GNU General Public License
+;; along with GNU Emacs; see the file COPYING.  If not, write to the
+;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+;; Boston, MA 02111-1307, USA.
+
 ;;; Code:
 
 (require 'tl-str)
 (require 'tl-list)
 (require 'tl-atype)
 (require 'tl-misc)
-(require 'tl-822)
+(require 'std11)
 (require 'mel)
 (require 'tm-ew-d)
 (require 'tm-def)
 (require 'tm-parse)
+(require 'tm-text)
 
 
 ;;; @ version
 ;;;
 
 (defconst mime-viewer/RCS-ID
-  "$Id: tm-view.el,v 7.32.1.2 1995/12/10 20:29:06 morioka Exp $")
+  "$Id: tm-view.el,v 7.79 1996/12/16 15:06:08 morioka Exp $")
 
 (defconst mime-viewer/version (get-version-string mime-viewer/RCS-ID))
 (defconst mime/viewer-version mime-viewer/version)
@@ -55,72 +53,110 @@
 
 (defvar mime/content-decoding-condition
   '(((type . "text/plain")
-     (method "tm-plain" nil 'file 'type 'encoding 'mode 'name))
+     (method "tm-plain" nil 'file 'type 'encoding 'mode 'name)
+     (mode "play" "print")
+     )
     ((type . "text/html")
      (method "tm-html" nil 'file 'type 'encoding 'mode 'name)
-     (mode . "play"))
+     (mode . "play")
+     )
     ((type . "text/x-rot13-47")
-     (method . mime-article/decode-caesar))
-    
+     (method . mime-article/decode-caesar)
+     (mode . "play")
+     )
     ((type . "audio/basic")
-     (method "tm-au"    nil 'file 'type 'encoding 'mode 'name))
+     (method "tm-au"    nil 'file 'type 'encoding 'mode 'name)
+     (mode . "play")
+     )
     
-    ((type . "image/gif")
-     (method "tm-image" nil 'file 'type 'encoding 'mode 'name))
     ((type . "image/jpeg")
-     (method "tm-image" nil 'file 'type 'encoding 'mode 'name))
+     (method "tm-image" nil 'file 'type 'encoding 'mode 'name)
+     (mode "play" "print")
+     )
+    ((type . "image/gif")
+     (method "tm-image" nil 'file 'type 'encoding 'mode 'name)
+     (mode "play" "print")
+     )
     ((type . "image/tiff")
-     (method "tm-image" nil 'file 'type 'encoding 'mode 'name))
+     (method "tm-image" nil 'file 'type 'encoding 'mode 'name)
+     (mode "play" "print")
+     )
     ((type . "image/x-tiff")
-     (method "tm-image" nil 'file 'type 'encoding 'mode 'name))
+     (method "tm-image" nil 'file 'type 'encoding 'mode 'name)
+     (mode "play" "print")
+     )
     ((type . "image/x-xbm")
-     (method "tm-image" nil 'file 'type 'encoding 'mode 'name))
+     (method "tm-image" nil 'file 'type 'encoding 'mode 'name)
+     (mode "play" "print")
+     )
     ((type . "image/x-pic")
-     (method "tm-image" nil 'file 'type 'encoding 'mode 'name))
+     (method "tm-image" nil 'file 'type 'encoding 'mode 'name)
+     (mode "play" "print")
+     )
+    ((type . "image/x-mag")
+     (method "tm-image" nil 'file 'type 'encoding 'mode 'name)
+     (mode "play" "print")
+     )
     
     ((type . "video/mpeg")
-     (method "tm-mpeg"  nil 'file 'type 'encoding 'mode 'name))
+     (method "tm-mpeg"  nil 'file 'type 'encoding 'mode 'name)
+     (mode . "play")
+     )
     
+    ((type . "application/postscript")
+     (method "tm-ps" nil 'file 'type 'encoding 'mode 'name)
+     (mode "play" "print")
+     )
     ((type . "application/octet-stream")
-     (method "tm-file"  nil 'file 'type 'encoding 'mode 'name))
+     (method "tm-file"  nil 'file 'type 'encoding 'mode 'name)
+     (mode "play" "print")
+     )
     
     ;;((type . "message/external-body")
     ;; (method "xterm" nil
     ;;	       "-e" "showexternal"
     ;;         'file '"access-type" '"name" '"site" '"directory"))
     ((type . "message/rfc822")
-     (method . mime-article/view-message/rfc822))
+     (method . mime-article/view-message/rfc822)
+     (mode . "play")
+     )
     ((type . "message/partial")
-     (method . mime-article/decode-message/partial))
+     (method . mime-article/decode-message/partial)
+     (mode . "play")
+     )
     
-    ((method "metamail" t
-	     "-m" "tm" "-x" "-d" "-z" "-e" 'file)(mode . "play"))
+    ((method "metamail" t "-m" "tm" "-x" "-d" "-z" "-e" 'file)
+     (mode . "play")
+     )
     ((method "tm-file"  nil 'file 'type 'encoding 'mode 'name)
-     (mode . "extract"))
+     (mode . "extract")
+     )
     ))
 
 (defvar mime-viewer/childrens-header-showing-Content-Type-list
   '("message/rfc822" "message/news"))
 
 (defvar mime-viewer/default-showing-Content-Type-list
-  '("text/plain" "text/richtext" "text/enriched"
+  '("text/plain" nil "text/richtext" "text/enriched"
     "text/x-latex" "application/x-latex"
-    "application/octet-stream" nil
-    "application/pgp"
+    "message/delivery-status"
+    "application/pgp" "text/x-pgp"
+    "application/octet-stream"
     "application/x-selection" "application/x-comment"))
 
-(defvar mime-viewer/content-subject-omitting-Content-Type-list
+(defvar mime-viewer/content-button-ignored-ctype-list
   '("application/x-selection"))
 
-(defvar mime-viewer/content-subject-showing-Content-Type-list
+(defvar mime-viewer/content-button-visible-ctype-list
   '("application/pgp"))
 
 (defvar mime-viewer/uuencode-encoding-name-list '("x-uue" "x-uuencode"))
 
 (defvar mime-viewer/ignored-field-list
-  '(".*Received" "Return-Path" "Replied" "Errors-To"
-    "Lines" "Sender" "Path" "Nntp-Posting-Host"
-    "Content-Type" "Precedence" "X-Face"
+  '(".*Received" ".*Path" ".*Id" "References"
+    "Replied" "Errors-To"
+    "Lines" "Sender" ".*Host" "Xref"
+    "Content-Type" "Precedence"
     "Status" "X-VM-.*")
   "All fields that match this list will be hidden in MIME preview buffer.
 Each elements are regexp of field-name. [tm-view.el]")
@@ -130,6 +166,18 @@ Each elements are regexp of field-name. [tm-view.el]")
 	  (apply (function regexp-or) mime-viewer/ignored-field-list)
 	  ":"))
 
+(defvar mime-viewer/visible-field-list
+  '("Dnas.*" "Message-Id")
+  "All fields that match this list will be displayed in MIME preview buffer.
+Each elements are regexp of field-name. [tm-view.el]")
+
+(defvar mime-viewer/visible-field-regexp
+  (concat "^"
+	  (apply (function regexp-or) mime-viewer/visible-field-list)
+	  ":"))
+
+(defvar mime-viewer/redisplay nil)
+
 (defvar mime-viewer/announcement-for-message/partial
   (if (and (>= emacs-major-version 19) window-system)
       "\
@@ -176,71 +224,96 @@ Each elements are regexp of field-name. [tm-view.el]")
     ))
 
 
-;;; @@ content subject
+;;; @@ content button
 ;;;
 
-(defun mime-viewer/insert-content-subject
-  (rcnum cinfo ctype params subj)
+(defun mime-preview/insert-content-button
+  (rcnum cinfo ctype params subj encoding)
   (save-restriction
     (narrow-to-region (point)(point))
-    (insert
-     (let ((access-type (assoc "access-type" params))
-	   (num (or (assoc-value "x-part-number" params)
-		    (if (consp rcnum)
-			(mapconcat (function
-				    (lambda (num)
-				      (format "%s" (1+ num))
-				      ))
-				   (reverse rcnum) ".")
-		      "0"))
-		))
-       (if access-type
-	   (let ((server (assoc "server" params)))
-	     (setq access-type (cdr access-type))
-	     (if server
-		 (format "[%s %s ([%s] %s)]\n" num subj
-			 access-type (cdr server))
-	       (let ((site (assoc-value "site" params))
-		     (dir (assoc-value "directory" params))
-		     )
-		 (format "[%s %s ([%s] %s:%s)]\n" num subj
-			 access-type site dir)
-		 )))
-	 (format "[%s %s (%s)]\n" num subj ctype)
-	 )))
+    (let ((access-type (assoc "access-type" params))
+	  (charset (assoc "charset" params))
+	  (num (or (assoc-value "x-part-number" params)
+		   (if (consp rcnum)
+		       (mapconcat (function
+				   (lambda (num)
+				     (format "%s" (1+ num))
+				     ))
+				  (reverse rcnum) ".")
+		     "0"))
+	       ))
+      (cond (access-type
+	     (let ((server (assoc "server" params)))
+	       (setq access-type (cdr access-type))
+	       (if server
+		   (insert (format "[%s %s ([%s] %s)]\n" num subj
+				   access-type (cdr server)))
+		 (let ((site (assoc-value "site" params))
+		       (dir (assoc-value "directory" params))
+		       )
+		   (insert (format "[%s %s ([%s] %s:%s)]\n" num subj
+				   access-type site dir))
+		   )))
+	     )
+	    (t
+	     (insert (concat "[" num " " subj))
+	     (let ((rest
+		    (if (setq charset (cdr charset))
+			(if encoding
+			    (format " <%s; %s (%s)>]\n"
+				    ctype charset encoding)
+			  (format " <%s; %s>]\n" ctype charset)
+			  )
+		      (format " <%s>]\n" ctype)
+		      )))
+	       (if (>= (+ (current-column)(length rest))(window-width))
+		   (setq rest (concat "\n\t" rest))
+		 )
+	       (insert rest)
+	       ))))
     (tm:add-button (point-min)(1- (point-max))
 		   (function mime-viewer/play-content))
     ))
 
-(defun mime-viewer/default-content-subject-function
-  (rcnum cinfo ctype params subj)
+(defun mime-preview/default-content-button-function
+  (rcnum cinfo ctype params subj encoding)
   (if (and (consp rcnum)
 	   (not (member
 		 ctype
-		 mime-viewer/content-subject-omitting-Content-Type-list)))
-      (mime-viewer/insert-content-subject
-       rcnum cinfo ctype params subj)
+		 mime-viewer/content-button-ignored-ctype-list)))
+      (mime-preview/insert-content-button
+       rcnum cinfo ctype params subj encoding)
     ))
 
-(defvar mime-viewer/content-subject-function
-  (function mime-viewer/default-content-subject-function))
+(defvar mime-preview/content-button-function
+  (function mime-preview/default-content-button-function))
 
 
 ;;; @@ content header filter
 ;;;
 
-(defun mime-viewer/default-content-header-filter ()
+(defun mime-preview/cut-header ()
   (goto-char (point-min))
-  (while (and (re-search-forward mime-viewer/ignored-field-regexp nil t)
-	      (progn
+  (while (and
+	  (re-search-forward mime-viewer/ignored-field-regexp nil t)
+	  (let* ((beg (match-beginning 0))
+		 (end (match-end 0))
+		 (name (buffer-substring beg end))
+		 )
+	    (if (not (string-match mime-viewer/visible-field-regexp name))
 		(delete-region
-		 (match-beginning 0)
+		 beg
 		 (save-excursion
 		   (and
 		    (re-search-forward "^\\([^ \t]\\|$\\)" nil t)
 		    (match-beginning 0)
 		    )))
-		t)))
+	      )
+	    t)))
+  )
+
+(defun mime-viewer/default-content-header-filter ()
+  (mime-preview/cut-header)
   (mime/decode-message-header)
   )
 
@@ -251,18 +324,16 @@ Each elements are regexp of field-name. [tm-view.el]")
 ;;;
 
 (defvar mime-viewer/content-filter-alist
-  '(("text/plain"      . mime-viewer/filter-text/plain)
-    ("application/pgp" . mime-viewer/filter-text/plain)
-    (nil . mime-viewer/filter-text/plain)))
-
-(defun mime-viewer/default-content-filter (rcnum cinfo ctype params subj)
-  )
+  '(("text/enriched" . mime-preview/filter-for-text/enriched)
+    ("text/richtext" . mime-preview/filter-for-text/richtext)
+    (t . mime-preview/filter-for-text/plain)
+    ))
 
 
 ;;; @@ content separator
 ;;;
 
-(defun mime-viewer/default-content-separator (rcnum cinfo ctype params subj)
+(defun mime-preview/default-content-separator (rcnum cinfo ctype params subj)
   (if (and (not (mime-viewer/header-visible-p rcnum cinfo ctype))
 	   (not (mime-viewer/body-visible-p rcnum cinfo ctype))
 	   )
@@ -278,6 +349,7 @@ Each elements are regexp of field-name. [tm-view.el]")
 ;; for XEmacs
 (defvar mime::article/preview-buffer nil)
 (defvar mime::article/code-converter nil)
+(defvar mime::preview/article-buffer nil)
 
 (make-variable-buffer-local 'mime::article/content-info)
 (make-variable-buffer-local 'mime::article/preview-buffer)
@@ -300,14 +372,29 @@ Each elements are regexp of field-name. [tm-view.el]")
 (defvar mime-viewer/over-to-previous-method-alist nil)
 (defvar mime-viewer/over-to-next-method-alist nil)
 
+(defvar mime-viewer/show-summary-method nil)
+
+
+;;; @@ following method
+;;;
+
+(defvar mime-viewer/following-method-alist nil)
+
+(defvar mime-viewer/following-required-fields-list
+  '("From"))
+
 
 ;;; @@ X-Face
 ;;;
 
 ;; hack from Gnus 5.0.4.
 
+(defvar mime-viewer/x-face-to-pbm-command
+  "{ echo '/* Width=48, Height=48 */'; uncompface; } | icontopbm")
+
 (defvar mime-viewer/x-face-command
-  "{ echo '/* Width=48, Height=48 */'; uncompface; } | icontopbm | xv -quit -"
+  (concat mime-viewer/x-face-to-pbm-command
+	  " | xv -quit -")
   "String to be executed to display an X-Face field.
 The command will be executed in a sub-shell asynchronously.
 The compressed face will be piped to this command.")
@@ -322,13 +409,25 @@ The compressed face will be piped to this command.")
     (goto-char (point-min))
     (if (re-search-forward "^X-Face:[ \t]*" nil t)
 	(let ((beg (match-end 0))
-	      (end (rfc822/field-end))
+	      (end (std11-field-end))
 	      )
 	  (call-process-region beg end "sh" nil 0 nil
 			       "-c" mime-viewer/x-face-command)
 	  ))))
 
 
+;;; @@ utility
+;;;
+
+(defun mime-preview/get-original-major-mode ()
+  (if mime::preview/mother-buffer
+      (save-excursion
+	(set-buffer mime::preview/mother-buffer)
+	(mime-preview/get-original-major-mode)
+	)
+    mime::preview/original-major-mode))
+
+
 ;;; @ data structures
 ;;;
 
@@ -348,48 +447,44 @@ The compressed face will be piped to this command.")
 	(get-buffer ibuf)
 	(set-buffer ibuf)
 	))
-  (setq mime::article/content-info (mime/parse-message ctl encoding))
+  (or mime-viewer/redisplay
+      (setq mime::article/content-info (mime/parse-message ctl encoding))
+      )
   (let ((ret (mime-viewer/make-preview-buffer obuf)))
     (setq mime::article/preview-buffer (car ret))
     ret))
 
 (defun mime-viewer/make-preview-buffer (&optional obuf)
-  (let ((cinfo mime::article/content-info)
-	(the-buf (current-buffer))
-	(mode major-mode)
-	pcl dest)
+  (let* ((cinfo mime::article/content-info)
+	 (pcl (mime/flatten-content-info cinfo))
+	 (dest (make-list (length pcl) nil))
+	 (the-buf (current-buffer))
+	 (mode major-mode)
+	 )
     (or obuf
-	(setq obuf (concat "*Preview-" (buffer-name the-buf) "*"))
-	)
-    (setq pcl (mime/flatten-content-info cinfo))
-    (let ((bf (get-buffer obuf)))
-      (if bf
-	  (progn
-	    (set-buffer obuf)
-	    (setq buffer-read-only nil)
-      	    (erase-buffer)
-	    )
-	(setq bf (get-buffer-create obuf))
-	(set-buffer obuf)
-	))
+	(setq obuf (concat "*Preview-" (buffer-name the-buf) "*")))
+    (set-buffer (get-buffer-create obuf))
+    (setq buffer-read-only nil)
+    (widen)
+    (erase-buffer)
     (setq mime::preview/article-buffer the-buf)
     (setq mime::preview/original-major-mode mode)
     (setq major-mode 'mime/viewer-mode)
     (setq mode-name "MIME-View")
-    (setq dest
-	  (mapcar
-	   (function
-	    (lambda (content)
-	      (mime-viewer/display-content content cinfo the-buf obuf)
-	      ))
-	   pcl))
+    (let ((drest dest))
+      (while pcl
+	(setcar drest
+		(mime-preview/display-content (car pcl) cinfo the-buf obuf))
+	(setq pcl (cdr pcl)
+	      drest (cdr drest))
+	))
     (set-buffer-modified-p nil)
     (setq buffer-read-only t)
     (set-buffer the-buf)
     (list obuf dest)
     ))
 
-(defun mime-viewer/display-content (content cinfo ibuf obuf)
+(defun mime-preview/display-content (content cinfo ibuf obuf)
   (let* ((beg (mime::content-info/point-min content))
 	 (end (mime::content-info/point-max content))
 	 (ctype (mime::content-info/type content))
@@ -409,42 +504,39 @@ The compressed face will be piped to this command.")
       (narrow-to-region beg end)
       (setq subj
 	    (mime-eword/decode-string
-	     (mime-viewer/get-subject params encoding)))
+	     (mime-article/get-subject params encoding)))
       )
     (set-buffer obuf)
     (setq nb (point))
     (narrow-to-region nb nb)
-    (funcall mime-viewer/content-subject-function
-	     rcnum cinfo ctype params subj)
-    (set-buffer ibuf)
+    (funcall mime-preview/content-button-function
+	     rcnum cinfo ctype params subj encoding)
     (if (mime-viewer/header-visible-p rcnum cinfo ctype)
-	(mime-viewer/display-header beg he obuf)
+	(mime-preview/display-header beg he)
       )
     (if (and (null rcnum)
 	     (member
-	      ctype mime-viewer/content-subject-showing-Content-Type-list))
+	      ctype mime-viewer/content-button-visible-ctype-list))
 	(save-excursion
-	  (set-buffer obuf)
 	  (goto-char (point-max))
-	  (mime-viewer/insert-content-subject rcnum cinfo ctype params subj)
+	  (mime-preview/insert-content-button
+	   rcnum cinfo ctype params subj encoding)
 	  ))
     (cond ((mime-viewer/body-visible-p rcnum cinfo ctype)
-	   (mime-viewer/display-body he end obuf
-				     rcnum cinfo ctype params subj encoding)
+	   (mime-preview/display-body he end
+				      rcnum cinfo ctype params subj encoding)
 	   )
 	  ((equal ctype "message/partial")
-	   (mime-viewer/display-message/partial obuf)
+	   (mime-preview/display-message/partial)
 	   )
 	  ((and (null rcnum)
 		(null (mime::content-info/children cinfo))
 		)
-	   (set-buffer obuf)
 	   (goto-char (point-max))
-	   (mime-viewer/insert-content-subject rcnum cinfo ctype params subj)
-	   )
-	  (t (set-buffer obuf))
-	  )
-    (mime-viewer/default-content-separator rcnum cinfo ctype params subj)
+	   (mime-preview/insert-content-button
+	    rcnum cinfo ctype params subj encoding)
+	   ))
+    (mime-preview/default-content-separator rcnum cinfo ctype params subj)
     (prog1
 	(progn
 	  (setq ne (point-max))
@@ -454,40 +546,32 @@ The compressed face will be piped to this command.")
       (goto-char ne)
       )))
 
-(defun mime-viewer/display-header (beg end obuf)
-  (let ((str (buffer-substring beg end))
-	(f (assq major-mode mime-viewer/content-header-filter-alist))
-	)
-    (save-excursion
-      (set-buffer obuf)
-      (save-restriction
-	(narrow-to-region (point)(point))
-	(insert str)
-	(if (and f (setq f (cdr f)))
-	    (funcall f)
-	  (mime-viewer/default-content-header-filter)
-	  )
-	(run-hooks 'mime-viewer/content-header-filter-hook)
-	))))
+(defun mime-preview/display-header (beg end)
+  (save-restriction
+    (narrow-to-region (point)(point))
+    (insert-buffer-substring mime::preview/article-buffer beg end)
+    (let ((f (cdr (assq mime::preview/original-major-mode
+			mime-viewer/content-header-filter-alist))))
+      (if (functionp f)
+	  (funcall f)
+	(mime-viewer/default-content-header-filter)
+	))
+    (run-hooks 'mime-viewer/content-header-filter-hook)
+    ))
 
-(defun mime-viewer/display-body (beg end obuf
-				     rcnum cinfo ctype params subj encoding)
-  (let ((str (buffer-substring beg end))
-	be)
-    (set-buffer obuf)
-    (save-restriction
-      (setq be (point-max))
-      (narrow-to-region be be)
-      (insert str)
-      (let ((f (assoc-value ctype mime-viewer/content-filter-alist)))
-	(if (and f (fboundp f))
-	    (funcall f ctype params encoding)
-	  (mime-viewer/default-content-filter rcnum cinfo ctype params subj)
-	  ))
+(defun mime-preview/display-body (beg end
+				      rcnum cinfo ctype params subj encoding)
+  (save-restriction
+    (narrow-to-region (point-max)(point-max))
+    (insert-buffer-substring mime::preview/article-buffer beg end)
+    (let ((f (cdr (or (assoc ctype mime-viewer/content-filter-alist)
+		      (assq t mime-viewer/content-filter-alist)))))
+      (and (functionp f)
+	   (funcall f ctype params encoding)
+	   )
       )))
 
-(defun mime-viewer/display-message/partial (obuf)
-  (set-buffer obuf)
+(defun mime-preview/display-message/partial ()
   (save-restriction
     (goto-char (point-max))
     (if (not (search-backward "\n\n" nil t))
@@ -500,7 +584,7 @@ The compressed face will be piped to this command.")
 		     (function mime-viewer/play-content))
       )))
 
-(defun mime-viewer/get-subject (param &optional encoding)
+(defun mime-article/get-uu-filename (param &optional encoding)
   (if (member (or encoding
 		  (cdr (assq 'encoding param))
 		  )
@@ -511,30 +595,23 @@ The compressed face will be piped to this command.")
 		    (buffer-substring (match-beginning 0)(match-end 0))
 		  ))
 	    ""))
-    (let (ret)
-      (or (and (setq ret (assoc "name" param))
-	       (rfc822/strip-quoted-string (cdr ret))
-	       )
-	  (and (setq ret (assoc "x-name" param))
-	       (rfc822/strip-quoted-string (cdr ret))
-	       )
-	  
-	  (save-excursion
-	    (save-restriction
-	      (goto-char (point-min))
-	      (narrow-to-region (point-min)
-				(or (and (search-forward "\n\n" nil t)
-					 (match-beginning 0)
-					 )
-				    (point-max)))
-	      (or
-	       (rfc822/get-field-body "Content-Description")
-	       (rfc822/get-field-body "Subject")
-	       )))
-	  ""))
     ))
 
-  
+(defun mime-article/get-subject (param &optional encoding)
+  (or (std11-find-field-body '("Content-Description" "Subject"))
+      (let (ret)
+	(if (or (and (setq ret (mime/Content-Disposition))
+		     (setq ret (assoc "filename" (cdr ret)))
+		     )
+		(setq ret (assoc "name" param))
+		(setq ret (assoc "x-name" param))
+		)
+	    (std11-strip-quoted-string (cdr ret))
+	  ))
+      (mime-article/get-uu-filename param encoding)
+      ""))
+
+
 ;;; @ content information
 ;;;
 
@@ -564,13 +641,12 @@ The compressed face will be piped to this command.")
   (or cinfo
       (setq cinfo mime::article/content-info)
       )
-  (some-element
-   (function
-    (lambda (ci)
-      (equal (mime::content-info/rcnum ci) rcnum)
-      ))
-   (mime/flatten-content-info cinfo)
-   ))
+  (find-if (function
+	    (lambda (ci)
+	      (equal (mime::content-info/rcnum ci) rcnum)
+	      ))
+	   (mime/flatten-content-info cinfo)
+	   ))
 
 (defun mime-article/cnum-to-cinfo (cn &optional cinfo)
   (or cinfo
@@ -619,151 +695,111 @@ The compressed face will be piped to this command.")
     ))
 
 
-;;; @ content filter
+;;; @ MIME viewer mode
 ;;;
 
-(defvar mime-viewer/code-converter-alist
-  '((mime/show-message-mode . mime/code-convert-region-to-emacs))
-  )
-
-(defun mime-viewer/default-code-convert-region
-  (beg end charset &optional encoding)
-  (if (member encoding '("quoted-printable" "base64"))
-      (mime/code-convert-region-to-emacs beg (point-max) charset)
-    ))
-
-(defun mime-preview/decode-text-region (beg end charset encoding)
-  (mime/decode-region encoding beg end)
-  (let* ((mode mime::preview/original-major-mode)
-	 (m (or (save-excursion
-		  (set-buffer mime::preview/article-buffer)
-		  mime::article/code-converter)
-		(cdr (assq mode mime-viewer/code-converter-alist))
-		))
-	 )
-    (if (and m (fboundp m))
-	(funcall m beg (point-max) charset encoding)
-      (mime-viewer/default-code-convert-region
-       beg (point-max) charset encoding)
-      )))
-
-(defun mime-viewer/filter-text/plain (ctype params encoding)
-  (let ((charset (cdr (assoc "charset" params)))
-	(beg (point-min)) (end (point-max))
-	)
-    (mime-preview/decode-text-region beg end charset encoding)
-    )
-  (goto-char (point-max))
-  (if (not (eq (char-after (1- (point))) ?\n))
-      (insert "\n")
+(defconst mime-viewer/menu-title "MIME-View")
+(defconst mime-viewer/menu-list
+  '((up		 "Move to upper content"      mime-viewer/up-content)
+    (previous	 "Move to previous content"   mime-viewer/previous-content)
+    (next	 "Move to next content"	      mime-viewer/next-content)
+    (scroll-down "Scroll to previous content" mime-viewer/scroll-down-content)
+    (scroll-up	 "Scroll to next content"     mime-viewer/scroll-up-content)
+    (play	 "Play Content"               mime-viewer/play-content)
+    (extract	 "Extract Content"            mime-viewer/extract-content)
+    (print	 "Print"                      mime-viewer/print-content)
+    (x-face	 "Show X Face"                mime-viewer/display-x-face)
     )
-  (if browse-url-browser-function
-      (progn
-	(goto-char (point-min))
-	(while (re-search-forward tm:URL-regexp nil t)
-	  (tm:add-button (match-beginning 0)(match-end 0)
-			 (function tm:browse-url))
-	  )))
-  (run-hooks 'mime-viewer/plain-text-preview-hook)
-  )
-
-
-;;; @ MIME viewer mode
-;;;
+  "Menu for MIME Viewer")
 
-(defvar mime/viewer-mode-map nil)
-(if (null mime/viewer-mode-map)
+(if running-xemacs
     (progn
-      (setq mime/viewer-mode-map (make-keymap))
-      (suppress-keymap mime/viewer-mode-map)
-      (define-key mime/viewer-mode-map
-	"u"        (function mime-viewer/up-content))
-      (define-key mime/viewer-mode-map
-	"p"        (function mime-viewer/previous-content))
-      (define-key mime/viewer-mode-map
-	"n"        (function mime-viewer/next-content))
-      (define-key mime/viewer-mode-map
-	" "        (function mime-viewer/scroll-up-content))
-      (define-key mime/viewer-mode-map
-	"\M- "     (function mime-viewer/scroll-down-content))
-      (define-key mime/viewer-mode-map
-	"\177"     (function mime-viewer/scroll-down-content))
-      (define-key mime/viewer-mode-map
-	"\C-m"     (function mime-viewer/next-line-content))
-      (define-key mime/viewer-mode-map
-	"\C-\M-m"  (function mime-viewer/previous-line-content))
-      (define-key mime/viewer-mode-map
-	"v"        (function mime-viewer/play-content))
-      (define-key mime/viewer-mode-map
-	"e"	   (function mime-viewer/extract-content))
-      (define-key mime/viewer-mode-map
-	"\C-c\C-p" (function mime-viewer/print-content))
-      (define-key mime/viewer-mode-map
-	"f"        (function mime-viewer/display-x-face))
-      (define-key mime/viewer-mode-map
-	"q"        (function mime-viewer/quit))
-      (define-key mime/viewer-mode-map
-	"\C-c\C-x" (function mime-viewer/kill-buffer))
-      (define-key mime/viewer-mode-map
-        "<"        (function beginning-of-buffer))
-      (define-key mime/viewer-mode-map
-        ">"        (function end-of-buffer))
-      (if mouse-button-2
-	  (define-key mime/viewer-mode-map
-	    mouse-button-2 (function tm:button-dispatcher))
-	)
-      (if mouse-button-3
-	  (define-key mime/viewer-mode-map
-	    mouse-button-3 (function mime-viewer/popup-menu))
-	)
+      (defvar mime-viewer/xemacs-popup-menu
+	(cons mime-viewer/menu-title
+	      (mapcar (function
+		       (lambda (item)
+			 (vector (nth 1 item)(nth 2 item) t)
+			 ))
+		      mime-viewer/menu-list)))
+      (defun mime-viewer/xemacs-popup-menu (event)
+	"Popup the menu in the MIME Viewer buffer"
+	(interactive "e")
+	(select-window (event-window event))
+	(set-buffer (event-buffer event))
+	(popup-menu 'mime-viewer/xemacs-popup-menu))
       ))
 
-(defvar mime-viewer/popup-menu-title "MIME Viewer Commands")
-(defvar mime-viewer/popup-menu-items
-  '(("Move to upper content"	  . mime-viewer/up-content)
-    ("Move to previous content"	  . mime-viewer/previous-content)
-    ("Move to next content"       . mime-viewer/next-content)
-    ("Scroll to previous content" . mime-viewer/scroll-down-content)
-    ("Scroll to next content"     . mime-viewer/scroll-up-content)
-    ("Play Content"               . mime-viewer/play-content)
-    ("Extract Content"            . mime-viewer/extract-content)
-    ("Print"                      . mime-viewer/print-content)
-    ("Show X Face"                . mime-viewer/display-x-face)
-    )
-  "Popup Menu for MIME Viewer")
-
-(cond ((string-match "XEmacs\\|Lucid" emacs-version)
-       (defvar mime-viewer/popup-menu
-	 (cons mime-viewer/popup-menu-title
-	       (mapcar (function
-			(lambda (item)
-			  (vector (car item)(cdr item) t)
-			  ))
-		       mime-viewer/popup-menu-items)))       
-       (defun mime-viewer/popup-menu (event)
-	 "Popup the menu in the MIME Viewer buffer"
-	 (interactive "e")
-	 (select-window (event-window event))
-	 (set-buffer (event-buffer event))
-	 (popup-menu 'mime-viewer/popup-menu))
-       )
-      ((>= emacs-major-version 19)
-       (defun mime-viewer/popup-menu (event)
-	 (interactive "e")
-	 (mouse-set-point event)
-	 (let ((menu
-		(cons mime-viewer/popup-menu-title
-		      (list (cons "Menu Items" mime-viewer/popup-menu-items))
-		      )))
-	   (let ((func (x-popup-menu event menu)))
-	     (if func
-		 (funcall func)
-	       ))
+(defun mime-viewer/define-keymap (&optional mother)
+  (let ((mime/viewer-mode-map (if mother
+				  (copy-keymap mother)
+				(make-keymap))))
+    (suppress-keymap mime/viewer-mode-map)
+    (define-key mime/viewer-mode-map
+      "u"        (function mime-viewer/up-content))
+    (define-key mime/viewer-mode-map
+      "p"        (function mime-viewer/previous-content))
+    (define-key mime/viewer-mode-map
+      "n"        (function mime-viewer/next-content))
+    (define-key mime/viewer-mode-map
+      " "        (function mime-viewer/scroll-up-content))
+    (define-key mime/viewer-mode-map
+      "\M- "     (function mime-viewer/scroll-down-content))
+    (define-key mime/viewer-mode-map
+      "\177"     (function mime-viewer/scroll-down-content))
+    (define-key mime/viewer-mode-map
+      "\C-m"     (function mime-viewer/next-line-content))
+    (define-key mime/viewer-mode-map
+      "\C-\M-m"  (function mime-viewer/previous-line-content))
+    (define-key mime/viewer-mode-map
+      "v"        (function mime-viewer/play-content))
+    (define-key mime/viewer-mode-map
+      "e"	   (function mime-viewer/extract-content))
+    (define-key mime/viewer-mode-map
+      "\C-c\C-p" (function mime-viewer/print-content))
+    (define-key mime/viewer-mode-map
+      "x"        (function mime-viewer/display-x-face))
+    (define-key mime/viewer-mode-map
+      "a"        (function mime-viewer/follow-content))
+    (define-key mime/viewer-mode-map
+      "q"        (function mime-viewer/quit))
+    (define-key mime/viewer-mode-map
+      "h"        (function mime-viewer/show-summary))
+    (define-key mime/viewer-mode-map
+      "\C-c\C-x" (function mime-viewer/kill-buffer))
+    (define-key mime/viewer-mode-map
+      "<"        (function beginning-of-buffer))
+    (define-key mime/viewer-mode-map
+      ">"        (function end-of-buffer))
+    (define-key mime/viewer-mode-map
+      "?"        (function describe-mode))
+    (if mouse-button-2
+	(define-key mime/viewer-mode-map
+	  mouse-button-2 (function tm:button-dispatcher))
+      )
+    (cond (running-xemacs
+	   (define-key mime/viewer-mode-map
+	     mouse-button-3 (function mime-viewer/xemacs-popup-menu))
+	   )
+	  ((>= emacs-major-version 19)
+	   (define-key mime/viewer-mode-map [menu-bar mime-view]
+	     (cons mime-viewer/menu-title
+		   (make-sparse-keymap mime-viewer/menu-title)))
+	   (mapcar (function
+		    (lambda (item)
+		      (define-key mime/viewer-mode-map
+			(vector 'menu-bar 'mime-view (car item))
+			(cons (nth 1 item)(nth 2 item))
+			)
+		      ))
+		   (reverse mime-viewer/menu-list)
+		   )
 	   ))
-       ))
-
+    (use-local-map mime/viewer-mode-map)
+    (run-hooks 'mime-viewer/define-keymap-hook)
+    ))
 
-(defun mime/viewer-mode (&optional mother ctl encoding ibuf obuf)
+(defun mime/viewer-mode (&optional mother ctl encoding ibuf obuf
+				   mother-keymap)
   "Major mode for viewing MIME message.
 
 Here is a list of the standard keys for mime/viewer-mode.
@@ -782,16 +818,11 @@ M-RET		Move to previous line
 v		Decode current content as `play mode'
 e		Decode current content as `extract mode'
 C-c C-p		Decode current content as `print mode'
-f		Display X-Face
+a		Followup to current content.
+x		Display X-Face
 q		Quit
 button-2	Move to point under the mouse cursor
         	and decode current content as `play mode'
-
-
-Here are all the commands with their current binding,
-listed in key order:
-
-\\{mime/viewer-mode-map}
 "
   (interactive)
   (let ((buf (get-buffer mime/output-buffer-name)))
@@ -810,7 +841,7 @@ listed in key order:
 	  (progn
 	    (setq mime::preview/mother-buffer mother)
 	    ))
-      (use-local-map mime/viewer-mode-map)
+      (mime-viewer/define-keymap mother-keymap)
       (setq mime::preview/content-list (nth 1 ret))
       (goto-char
        (let ((ce (mime::preview-content-info/point-max
@@ -868,6 +899,115 @@ listed in key order:
     (mime-preview/decode-content)
     ))
 
+(defun mime-viewer/follow-content ()
+  (interactive)
+  (let ((root-cinfo
+	 (mime::preview-content-info/content-info
+	  (car mime::preview/content-list)))
+	pc p-beg p-end cinfo rcnum)
+    (let ((rest mime::preview/content-list)
+	  b e cell len rc)
+      (if (catch 'tag
+	    (while (setq cell (car rest))
+	      (setq b (mime::preview-content-info/point-min cell)
+		    e (mime::preview-content-info/point-max cell))
+	      (setq rest (cdr rest))
+	      (if (and (<= b (point))(<= (point) e))
+		  (throw 'tag cell)
+		)
+	      ))
+	  (progn
+	    (setq pc cell
+		  cinfo (mime::preview-content-info/content-info pc)
+		  rcnum (mime::content-info/rcnum cinfo))
+	    (setq len (length rcnum))
+	    (setq p-beg (mime::preview-content-info/point-min pc)
+		  p-end (mime::preview-content-info/point-max pc))
+	    (while (and (setq cell (car rest))
+			(progn
+			  (setq rc
+				(mime::content-info/rcnum
+				 (mime::preview-content-info/content-info
+				  cell)))
+			  (equal rcnum
+				 (nthcdr (- (length rc) len) rc))
+			  ))
+	      (setq p-end (mime::preview-content-info/point-max cell))
+	      (setq rest (cdr rest))
+	      ))))
+    (if pc
+	(let* ((mode (mime-preview/get-original-major-mode))
+	       (new-name (format "%s-%s" (buffer-name) (reverse rcnum)))
+	       new-buf
+	       (the-buf (current-buffer))
+	       (a-buf mime::preview/article-buffer)
+	       (hb (mime::content-info/point-min cinfo))
+	       (he (mime::content-info/point-max cinfo))
+	       fields from to cc reply-to subj mid f)
+	  (save-excursion
+	    (set-buffer (setq new-buf (get-buffer-create new-name)))
+	    (erase-buffer)
+	    (insert-buffer-substring the-buf p-beg p-end)
+	    (goto-char (point-min))
+	    (if (mime-viewer/header-visible-p rcnum root-cinfo)
+		(delete-region (goto-char (point-min))
+			       (if (re-search-forward "^$" nil t)
+				   (match-end 0)
+				 (point-min)))
+	      )
+	    (goto-char (point-min))
+	    (insert "\n")
+	    (goto-char (point-min))
+	    (let ((rcnum (mime::content-info/rcnum cinfo)) ci str)
+	      (while (progn
+		       (setq str
+			     (save-excursion
+			       (set-buffer a-buf)
+			       (setq ci (mime-article/rcnum-to-cinfo rcnum))
+			       (save-restriction
+				 (narrow-to-region
+				  (mime::content-info/point-min ci)
+				  (mime::content-info/point-max ci)
+				  )
+				 (std11-header-string-except
+				  (concat "^"
+					  (apply (function regexp-or) fields)
+					  ":") ""))))
+		       (if (string-equal (mime::content-info/type ci)
+					 "message/rfc822")
+			   nil
+			 (if str
+			     (insert str)
+			   )
+			 rcnum))
+		(setq fields (std11-collect-field-names)
+		      rcnum (cdr rcnum))
+		)
+	      )
+	    (let ((rest mime-viewer/following-required-fields-list))
+	      (while rest
+		(let ((field-name (car rest)))
+		  (or (std11-field-body field-name)
+		      (insert
+		       (format
+			(concat field-name
+				": "
+				(save-excursion
+				  (set-buffer the-buf)
+				  (set-buffer mime::preview/mother-buffer)
+				  (set-buffer mime::preview/article-buffer)
+				  (std11-field-body field-name)
+				  )
+				"\n")))
+		      ))
+		(setq rest (cdr rest))
+		))
+	    (mime/decode-message-header)
+	    )
+	  (funcall (cdr (assq mode mime-viewer/following-method-alist))
+		   new-buf)
+	  ))))
+
 (defun mime-viewer/display-x-face ()
   (interactive)
   (save-window-excursion
@@ -877,29 +1017,26 @@ listed in key order:
 
 (defun mime-viewer/up-content ()
   (interactive)
-  (let ((pc (mime-preview/point-pcinfo (point))) cinfo
-	(the-buf (current-buffer))
-	rcnum r)
-    (switch-to-buffer (mime::preview-content-info/buffer pc))
-    (setq cinfo (mime::preview-content-info/content-info pc))
-    (setq rcnum (mime::content-info/rcnum cinfo))
-    (if (null rcnum)
-	(mime-viewer/quit the-buf
-			  (mime::preview-content-info/buffer pc)
-			  )
-      (setq r (mime-article/rcnum-to-cinfo (cdr rcnum)))
-      (switch-to-buffer the-buf)
-      (catch 'tag
-	(let ((rpcl mime::preview/content-list) cell)
-	  (while rpcl
-	    (setq cell (car rpcl))
-	    (if (eq r (mime::preview-content-info/content-info cell))
-		(progn
-		  (goto-char (mime::preview-content-info/point-min cell))
-		  (throw 'tag nil)
-		  ))
+  (let* ((pc (mime-preview/point-pcinfo (point)))
+	 (cinfo (mime::preview-content-info/content-info pc))
+	 (rcnum (mime::content-info/rcnum cinfo))
+	 )
+    (if rcnum
+	(let ((r (save-excursion
+		   (set-buffer (mime::preview-content-info/buffer pc))
+                   (mime-article/rcnum-to-cinfo (cdr rcnum))
+		   ))
+	      (rpcl mime::preview/content-list)
+	      cell)
+	  (while (and
+		  (setq cell (car rpcl))
+		  (not (eq r (mime::preview-content-info/content-info cell)))
+		  )
 	    (setq rpcl (cdr rpcl))
-	    )))
+	    )
+	  (goto-char (mime::preview-content-info/point-min cell))
+	  )
+      (mime-viewer/quit)
       )))
 
 (defun mime-viewer/previous-content ()
@@ -909,7 +1046,7 @@ listed in key order:
 	 (i (- (length pcl) 1))
 	 beg)
     (catch 'tag
-      (while (>= i 0)
+      (while (> i 0)
 	(setq beg (mime::preview-content-info/point-min (nth i pcl)))
 	(if (> p beg)
 	    (throw 'tag (goto-char beg))
@@ -1019,25 +1156,29 @@ listed in key order:
   (mime-viewer/scroll-down-content 1)
   )
 
-(defun mime-viewer/quit (&optional the-buf buf)
+(defun mime-viewer/quit ()
   (interactive)
-  (or the-buf
-      (setq the-buf (current-buffer))
-      )
-  (or buf
-      (setq buf (mime::preview-content-info/buffer
-		 (mime-preview/point-pcinfo (point))))
-      )
-  (let ((r (progn
-	     (switch-to-buffer buf)
+  (let ((r (save-excursion
+	     (set-buffer (mime::preview-content-info/buffer
+			  (mime-preview/point-pcinfo (point))))
 	     (assq major-mode mime-viewer/quitting-method-alist)
 	     )))
     (if r
-	(progn
-	  (switch-to-buffer the-buf)
-	  (funcall (cdr r))
-	  ))
-    ))
+	(funcall (cdr r))
+      )))
+
+(defun mime-viewer/show-summary ()
+  (interactive)
+  (let ((r (save-excursion
+	     (set-buffer
+	      (mime::preview-content-info/buffer
+	       (mime-preview/point-pcinfo (point)))
+	      )
+	     (assq major-mode mime-viewer/show-summary-method)
+	     )))
+    (if r
+	(funcall (cdr r))
+      )))
 
 (defun mime-viewer/kill-buffer ()
   (interactive)
@@ -1051,3 +1192,5 @@ listed in key order:
 (provide 'tm-view)
 
 (run-hooks 'tm-view-load-hook)
+
+;;; tm-view.el ends here