tm 7.67.

[elisp/tm.git] / tm-view.el

diff --git a/tm-view.el b/tm-view.el
index c9b2d5e..30b5bd1 100644 (file)
--- a/tm-view.el
+++ b/tm-view.el
@@ -8,7 +8,7 @@
 ;;; 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.62 $
+;;; Version: $Revision: 7.65 $
 ;;; Keywords: mail, news, MIME, multimedia
 ;;;
 ;;; This file is part of tm (Tools for MIME).
@@ -45,7 +45,7 @@
 ;;;
 
 (defconst mime-viewer/RCS-ID
-  "$Id: tm-view.el,v 7.62 1996/05/17 07:59:40 morioka Exp $")
+  "$Id: tm-view.el,v 7.65 1996/05/23 16:45:10 shuhei-k Exp $")
 
 (defconst mime-viewer/version (get-version-string mime-viewer/RCS-ID))
 (defconst mime/viewer-version mime-viewer/version)
@@ -113,10 +113,10 @@
     "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"))
@@ -136,7 +136,7 @@ Each elements are regexp of field-name. [tm-view.el]")
          ":"))
 
 (defvar mime-viewer/visible-field-list
-  '("Dnas.*")
+  '("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]")
 
@@ -193,10 +193,10 @@ Each elements are regexp of field-name. [tm-view.el]")
     ))
 
 
-;;; @@ content subject
+;;; @@ content button
 ;;;
 
-(defun mime-preview/insert-content-subject
+(defun mime-preview/insert-content-button
   (rcnum cinfo ctype params subj encoding)
   (save-restriction
     (narrow-to-region (point)(point))
@@ -215,8 +215,8 @@ Each elements are regexp of field-name. [tm-view.el]")
             (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))
+                  (insert (format "[%s %s ([%s] %s)]\n" num subj
+                                  access-type (cdr server)))
                 (let ((site (assoc-value "site" params))
                       (dir (assoc-value "directory" params))
                       )
@@ -244,18 +244,18 @@ Each elements are regexp of field-name. [tm-view.el]")
                   (function mime-viewer/play-content))
     ))
 
-(defun mime-preview/default-content-subject-function
+(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-preview/insert-content-subject
+                mime-viewer/content-button-ignored-ctype-list)))
+      (mime-preview/insert-content-button
        rcnum cinfo ctype params subj encoding)
     ))
 
-(defvar mime-preview/content-subject-function
-  (function mime-preview/default-content-subject-function))
+(defvar mime-preview/content-button-function
+  (function mime-preview/default-content-button-function))
 
 
 ;;; @@ content header filter
@@ -475,17 +475,17 @@ The compressed face will be piped to this command.")
     (set-buffer obuf)
     (setq nb (point))
     (narrow-to-region nb nb)
-    (funcall mime-preview/content-subject-function
+    (funcall mime-preview/content-button-function
             rcnum cinfo ctype params subj encoding)
     (if (mime-viewer/header-visible-p rcnum cinfo ctype)
        (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
          (goto-char (point-max))
-         (mime-preview/insert-content-subject
+         (mime-preview/insert-content-button
           rcnum cinfo ctype params subj encoding)
          ))
     (cond ((mime-viewer/body-visible-p rcnum cinfo ctype)
@@ -499,7 +499,7 @@ The compressed face will be piped to this command.")
                (null (mime::content-info/children cinfo))
                )
           (goto-char (point-max))
-          (mime-preview/insert-content-subject
+          (mime-preview/insert-content-button
            rcnum cinfo ctype params subj encoding)
           ))
     (mime-preview/default-content-separator rcnum cinfo ctype params subj)
@@ -721,6 +721,8 @@ The compressed face will be piped to this command.")
         "<"        (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))
@@ -777,7 +779,8 @@ 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'