tm 7.36.

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

diff --git a/tm-view.el b/tm-view.el
index badb800..5c27012 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.34 $
+;;; Version: $Revision: 7.36 $
 ;;; Keywords: mail, news, MIME, multimedia
 ;;;
 ;;; This file is part of tm (Tools for MIME).
@@ -44,7 +44,7 @@
 ;;;
 
 (defconst mime-viewer/RCS-ID
-  "$Id: tm-view.el,v 7.34 1995/12/15 15:08:28 morioka Exp $")
+  "$Id: tm-view.el,v 7.36 1995/12/18 10:45:02 morioka Exp $")
 
 (defconst mime-viewer/version (get-version-string mime-viewer/RCS-ID))
 (defconst mime/viewer-version mime-viewer/version)
@@ -65,10 +65,10 @@
     ((type . "audio/basic")
      (method "tm-au"    nil 'file 'type 'encoding 'mode 'name))
     
-    ((type . "image/gif")
-     (method "tm-image" nil 'file 'type 'encoding 'mode 'name))
     ((type . "image/jpeg")
      (method "tm-image" nil 'file 'type 'encoding 'mode 'name))
+    ((type . "image/gif")
+     (method "tm-image" nil 'file 'type 'encoding 'mode 'name))
     ((type . "image/tiff")
      (method "tm-image" nil 'file 'type 'encoding 'mode 'name))
     ((type . "image/x-tiff")
@@ -77,6 +77,8 @@
      (method "tm-image" nil 'file 'type 'encoding 'mode 'name))
     ((type . "image/x-pic")
      (method "tm-image" nil 'file 'type 'encoding 'mode 'name))
+    ((type . "image/x-mag")
+     (method "tm-image" nil 'file 'type 'encoding 'mode 'name))
     
     ((type . "video/mpeg")
      (method "tm-mpeg"  nil 'file 'type 'encoding 'mode 'name))
@@ -103,10 +105,10 @@
   '("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"
+    "application/pgp" "text/x-pgp"
+    "application/octet-stream"
     "application/x-selection" "application/x-comment"))
 
 (defvar mime-viewer/content-subject-omitting-Content-Type-list
@@ -322,6 +324,8 @@ 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)
+
 
 ;;; @@ X-Face
 ;;;
@@ -739,6 +743,8 @@ The compressed face will be piped to this command.")
       (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))
@@ -1037,25 +1043,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)