(mime-acting-condition): Use `mime-method-to-save' instead of external
[elisp/semi.git] / mime-view.el
index a6eee66..f365499 100644 (file)
@@ -1,15 +1,14 @@
 ;;; mime-view.el --- interactive MIME viewer for GNU Emacs
 
-;; Copyright (C) 1995,1996,1997 Free Software Foundation, Inc.
+;; Copyright (C) 1995,1996,1997,1998 Free Software Foundation, Inc.
 
 ;; Author: MORIOKA Tomohiko <morioka@jaist.ac.jp>
 ;; Created: 1994/7/13
 ;;     Renamed: 1994/8/31 from tm-body.el
 ;;     Renamed: 1997/02/19 from tm-view.el
-;; Version: $Revision: 0.75 $
 ;; Keywords: MIME, multimedia, mail, news
 
-;; This file is part of SEMI (SEMI is Emacs MIME Interfaces).
+;; This file is part of SEMI (Sophisticated Emacs MIME Interfaces).
 
 ;; This program is free software; you can redistribute it and/or
 ;; modify it under the terms of the GNU General Public License as
@@ -28,7 +27,6 @@
 
 ;;; Code:
 
-(require 'cl)
 (require 'std11)
 (require 'mel)
 (require 'eword-decode)
 ;;; @ version
 ;;;
 
-(defconst mime-view-RCS-ID
-  "$Id: mime-view.el,v 0.75 1997-03-18 15:21:28 morioka Exp $")
-
-(defconst mime-view-version (get-version-string mime-view-RCS-ID))
+(defconst mime-view-version-string
+  `,(concat "SEMI MIME-View "
+           (mapconcat #'number-to-string (cdr semi-version) ".")
+           " (" (car semi-version) ")"))
 
 
 ;;; @ variables
 ;;;
 
-(defvar mime/content-decoding-condition
+(defvar mime-acting-condition
   '(((type . "text/plain")
      (method "tm-plain" nil 'file 'type 'encoding 'mode 'name)
      (mode "play" "print")
      (mode . "play")
      )
     ((type . "text/x-rot13-47")
-     (method . mime-article/decode-caesar)
+     (method . mime-method-to-display-caesar)
+     (mode . "play")
+     )
+    ((type . "text/x-rot13-47-48")
+     (method . mime-method-to-display-caesar)
      (mode . "play")
      )
     ((type . "audio/basic")
      (method "tm-image" nil 'file 'type 'encoding 'mode 'name)
      (mode "play" "print")
      )
+    ((type . "image/png")
+     (method "tm-image" nil 'file 'type 'encoding 'mode 'name)
+     (mode "play" "print")
+     )
     ((type . "image/tiff")
      (method "tm-image" nil 'file 'type 'encoding 'mode 'name)
      (mode "play" "print")
      (mode "play" "print")
      )
     ((type . "application/octet-stream")
-     (method "tm-file"  nil 'file 'type 'encoding 'mode 'name)
-     (mode "play" "print")
+     (method . mime-method-to-save)(mode "play" "print")
      )
-    
-    ;;((type . "message/external-body")
-    ;; (method "xterm" nil
-    ;;        "-e" "showexternal"
-    ;;         'file '"access-type" '"name" '"site" '"directory"))
+
     ((type . "message/external-body")
      ("access-type" . "anon-ftp")
-     (method . mime-article/decode-message/external-ftp)
+     (method . mime-method-to-display-message/external-ftp)
      )
     ((type . "message/rfc822")
-     (method . mime-article/view-message/rfc822)
+     (method . mime-method-to-display-message/rfc822)
      (mode . "play")
      )
     ((type . "message/partial")
-     (method . mime-article/decode-message/partial)
+     (method . mime-method-to-store-message/partial)
      (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")
-     )
+    ((method . mime-method-to-save)(mode . "extract"))
     ))
 
 (defvar mime-view-childrens-header-showing-Content-Type-list
@@ -185,121 +184,101 @@ Each elements are regexp of field-name.")
     ))
 
 
-;;; @@ predicate functions
-;;;
-
-(defun mime-view-header-visible-p (rcnum cinfo)
-  "Return non-nil if header of current entity is visible."
-  (or (null rcnum)
-      (member (mime::content-info/type
-              (mime-article/rcnum-to-cinfo (cdr rcnum) cinfo))
-             mime-view-childrens-header-showing-Content-Type-list)
-      ))
-
-(defun mime-view-body-visible-p (rcnum cinfo &optional ctype)
-  (let (ccinfo)
-    (or ctype
-       (setq ctype
-             (mime::content-info/type
-              (setq ccinfo (mime-article/rcnum-to-cinfo rcnum cinfo))
-              ))
-       )
-    (and (member ctype mime-view-visible-media-type-list)
-        (if (string-equal ctype "application/octet-stream")
-            (progn
-              (or ccinfo
-                  (setq ccinfo (mime-article/rcnum-to-cinfo rcnum cinfo))
-                  )
-              (member (mime::content-info/encoding ccinfo)
-                      '(nil "7bit" "8bit"))
-              )
-          t))
-    ))
-
-
 ;;; @@ entity button
 ;;;
 
-(defun mime-view-insert-entity-button (rcnum cinfo ctype params subj encoding)
+(defun mime-view-insert-entity-button (rcnum cinfo
+                                            media-type media-subtype params
+                                            subj encoding)
   "Insert entity-button."
-  (save-restriction
-    (narrow-to-region (point)(point))
-    (let ((access-type (assoc "access-type" params))
-         (num (or (cdr (assoc "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 (cdr (assoc "site" params)))
-                      (dir (cdr (assoc "directory" params)))
-                      )
-                  (insert (format "[%s %s ([%s] %s:%s)]\n" num subj
-                                  access-type site dir))
-                  )))
-            )
-           (t
-            (let ((charset (cdr (assoc "charset" params))))
-              (insert (concat "[" num " " subj))
+  (mime-insert-button
+   (let ((access-type (assoc "access-type" params))
+        (num (or (cdr (assoc "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
+                 (format "%s %s ([%s] %s)"
+                         num subj access-type (cdr server))
+               (let ((site (cdr (assoc "site" params)))
+                     (dir (cdr (assoc "directory" params)))
+                     )
+                 (format "%s %s ([%s] %s:%s)"
+                         num subj access-type site dir)
+                 )))
+           )
+          (t
+           (let ((charset (cdr (assoc "charset" params))))
+             (concat
+              num " " subj
               (let ((rest
-                     (concat " <" ctype
+                     (format " <%s/%s%s%s>"
+                             media-type media-subtype
                              (if charset
                                  (concat "; " charset)
-                               (if encoding (concat " (" encoding ")"))
-                               )
-                             ">]\n")))
+                               "")
+                             (if encoding
+                                 (concat " (" encoding ")")
+                               ""))))
                 (if (>= (+ (current-column)(length rest))(window-width))
-                    (insert "\n\t")
-                  )
-                (insert rest)
-                ))))
-      )
-    (mime-add-button (point-min)(1- (point-max))
-                    (function mime-view-play-current-entity))
-    ))
+                    "\n\t")
+                rest)))
+           )))
+   (function mime-view-play-current-entity))
+  )
 
-(defun mime-view-entity-button-function
-  (rcnum cinfo ctype params subj encoding)
+(defun mime-view-entity-button-function (rcnum cinfo
+                                              media-type media-subtype
+                                              params subj encoding)
   "Insert entity button conditionally.
 Please redefine this function if you want to change default setting."
   (or (null rcnum)
-      (string= ctype "application/x-selection")
-      (and (string= ctype "application/octet-stream")
-          (string= (mime::content-info/type
-                    (mime-article/rcnum-to-cinfo (cdr rcnum) cinfo))
-                   "multipart/encrypted"))
-      (mime-view-insert-entity-button rcnum cinfo ctype params subj encoding)
+      (and (eq media-type 'application)
+          (or (eq media-subtype 'x-selection)
+              (and (eq media-subtype 'octet-stream)
+                   (let ((entity-info
+                          (mime-article/rcnum-to-cinfo (cdr rcnum) cinfo)))
+                     (and (eq (mime-entity-info-media-type entity-info)
+                              'multipart)
+                          (eq (mime-entity-info-media-subtype entity-info)
+                              'encrypted)
+                          )))))
+      (mime-view-insert-entity-button
+       rcnum cinfo media-type media-subtype params subj encoding)
       ))
 
 
 ;;; @@ content header filter
 ;;;
 
-(defsubst mime-view-cut-header ()
+(defun mime-view-cut-header ()
   (goto-char (point-min))
   (while (re-search-forward mime-view-ignored-field-regexp nil t)
     (let* ((beg (match-beginning 0))
           (end (match-end 0))
           (name (buffer-substring beg end))
           )
-      (or (member-if (function
-                     (lambda (regexp)
-                       (string-match regexp name)
-                       )) mime-view-visible-field-list)
-         (delete-region beg
+      (catch 'visible
+       (let ((rest mime-view-visible-field-list))
+         (while rest
+           (if (string-match (car rest) name)
+               (throw 'visible nil)
+             )
+           (setq rest (cdr rest))))
+       (delete-region beg
+                      (save-excursion
                         (if (re-search-forward "^\\([^ \t]\\|$\\)" nil t)
                             (match-beginning 0)
-                          (point-max)))
-         ))))
+                          (point-max))))
+       ))))
 
 (defun mime-view-default-content-header-filter ()
   (mime-view-cut-header)
@@ -313,20 +292,26 @@ Please redefine this function if you want to change default setting."
 ;;;
 
 (defvar mime-view-content-filter-alist
-  '(("text/enriched" . mime-preview/filter-for-text/enriched)
-    ("text/richtext" . mime-preview/filter-for-text/richtext)
-    (t . mime-preview/filter-for-text/plain)
-    ))
+  '(("text/enriched" . mime-view-filter-for-text/enriched)
+    ("text/richtext" . mime-view-filter-for-text/richtext)
+    (t . mime-view-filter-for-text/plain)
+    )
+  "Alist of media-types vs. corresponding MIME-View filter functions.
+Each element looks like (TYPE/SUBTYPE . FUNCTION) or (t . FUNCTION).
+TYPE/SUBTYPE is a string of media-type and FUNCTION is a filter
+function.  t means default media-type.")
 
 
 ;;; @@ entity separator
 ;;;
 
-(defun mime-view-entity-separator-function (rcnum cinfo ctype params subj)
+(defun mime-view-entity-separator-function (rcnum cinfo
+                                                 media-type media-subtype
+                                                 params subj)
   "Insert entity separator conditionally.
 Please redefine this function if you want to change default setting."
   (or (mime-view-header-visible-p rcnum cinfo)
-      (mime-view-body-visible-p rcnum cinfo ctype)
+      (mime-view-body-visible-p rcnum cinfo media-type media-subtype)
       (progn
        (goto-char (point-max))
        (insert "\n")
@@ -339,7 +324,7 @@ Please redefine this function if you want to change default setting."
 ;;; @@@ in raw buffer
 ;;;
 
-(defvar mime::article/content-info
+(defvar mime-raw-content-info
   "Information about structure of message.
 Please use reference function `mime::content-info/SLOT-NAME' to
 reference slot of content-info.  Their argument is only content-info.
@@ -357,7 +342,7 @@ children    entities included in this entity (list of content-infos)
 If a entity includes other entities in its body, such as multipart or
 message/rfc822, content-infos of other entities are included in
 `children', so content-info become a tree.")
-(make-variable-buffer-local 'mime::article/content-info)
+(make-variable-buffer-local 'mime-raw-content-info)
 
 (defvar mime-view-buffer nil
   "MIME View buffer corresponding with the (raw) buffer.")
@@ -441,35 +426,19 @@ The compressed face will be piped to this command.")
          ))))
 
 
-;;; @@ utility
-;;;
-
-(defun mime-preview/get-original-major-mode ()
-  (if mime-mother-buffer
-      (save-excursion
-       (set-buffer mime-mother-buffer)
-       (mime-preview/get-original-major-mode)
-       )
-    mime-view-original-major-mode))
-
-
 ;;; @ buffer setup
 ;;;
 
-(defun mime-view-setup-buffer (&optional ctl encoding ibuf obuf)
+(defun mime-view-setup-buffers (&optional ctl encoding ibuf obuf)
   (if ibuf
       (progn
        (get-buffer ibuf)
        (set-buffer ibuf)
        ))
   (or mime-view-redisplay
-      (setq mime::article/content-info (mime-parse-message ctl encoding))
+      (setq mime-raw-content-info (mime-parse-message ctl encoding))
       )
-  (setq mime-view-buffer (mime-view-make-preview-buffer obuf))
-  )
-
-(defun mime-view-make-preview-buffer (&optional obuf)
-  (let* ((cinfo mime::article/content-info)
+  (let* ((cinfo mime-raw-content-info)
         (pcl (mime/flatten-content-info cinfo))
         (the-buf (current-buffer))
         (mode major-mode)
@@ -477,30 +446,40 @@ The compressed face will be piped to this command.")
     (or 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-raw-buffer the-buf)
-    (setq mime-view-original-major-mode mode)
-    (setq major-mode 'mime-view-mode)
-    (setq mode-name "MIME-View")
-    (while pcl
-      (mime-view-display-entity (car pcl) cinfo the-buf obuf)
-      (setq pcl (cdr pcl))
+    (let ((inhibit-read-only t))
+      ;;(setq buffer-read-only nil)
+      (widen)
+      (erase-buffer)
+      (setq mime-raw-buffer the-buf)
+      (setq mime-view-original-major-mode mode)
+      (setq major-mode 'mime-view-mode)
+      (setq mode-name "MIME-View")
+      (while pcl
+       (mime-view-display-entity (car pcl) cinfo the-buf obuf)
+       (setq pcl (cdr pcl))
+       )
+      (set-buffer-modified-p nil)
       )
-    (set-buffer-modified-p nil)
     (setq buffer-read-only t)
     (set-buffer the-buf)
-    obuf))
+    )
+  (setq mime-view-buffer obuf)
+  )
 
 (defun mime-view-display-entity (content cinfo ibuf obuf)
   "Display entity from content-info CONTENT."
-  (let* ((beg (mime::content-info/point-min content))
-        (end (mime::content-info/point-max content))
-        (ctype (mime::content-info/type content))
-        (params (mime::content-info/parameters content))
-        (encoding (mime::content-info/encoding content))
-        (rcnum (mime::content-info/rcnum content))
+  (let* ((beg (mime-entity-info-point-min content))
+        (end (mime-entity-info-point-max content))
+        (media-type (mime-entity-info-media-type content))
+        (media-subtype (mime-entity-info-media-subtype content))
+        (ctype (if media-type
+                   (if media-subtype
+                       (format "%s/%s" media-type media-subtype)
+                     (symbol-name media-type)
+                     )))
+        (params (mime-entity-info-parameters content))
+        (encoding (mime-entity-info-encoding content))
+        (rcnum (mime-entity-info-rnum content))
         he e nb ne subj)
     (set-buffer ibuf)
     (goto-char beg)
@@ -519,9 +498,10 @@ The compressed face will be piped to this command.")
     (set-buffer obuf)
     (setq nb (point))
     (narrow-to-region nb nb)
-    (mime-view-entity-button-function rcnum cinfo ctype params subj encoding)
+    (mime-view-entity-button-function
+     rcnum cinfo media-type media-subtype params subj encoding)
     (if (mime-view-header-visible-p rcnum cinfo)
-       (mime-preview/display-header beg he)
+       (mime-view-display-header beg he)
       )
     (if (and (null rcnum)
             (member
@@ -529,23 +509,24 @@ The compressed face will be piped to this command.")
        (save-excursion
          (goto-char (point-max))
          (mime-view-insert-entity-button
-          rcnum cinfo ctype params subj encoding)
+          rcnum cinfo media-type media-subtype params subj encoding)
          ))
-    (cond ((mime-view-body-visible-p rcnum cinfo ctype)
-          (mime-preview/display-body he end
+    (cond ((mime-view-body-visible-p rcnum cinfo media-type media-subtype)
+          (mime-view-display-body he end
                                      rcnum cinfo ctype params subj encoding)
           )
-         ((equal ctype "message/partial")
-          (mime-preview/display-message/partial)
+         ((and (eq media-type 'message)(eq media-subtype 'partial))
+          (mime-view-insert-message/partial-button)
           )
          ((and (null rcnum)
-               (null (mime::content-info/children cinfo))
+               (null (mime-entity-info-children cinfo))
                )
           (goto-char (point-max))
           (mime-view-insert-entity-button
-           rcnum cinfo ctype params subj encoding)
+           rcnum cinfo media-type media-subtype params subj encoding)
           ))
-    (mime-view-entity-separator-function rcnum cinfo ctype params subj)
+    (mime-view-entity-separator-function
+     rcnum cinfo media-type media-subtype params subj)
     (setq ne (point-max))
     (widen)
     (put-text-property nb ne 'mime-view-raw-buffer ibuf)
@@ -553,7 +534,7 @@ The compressed face will be piped to this command.")
     (goto-char ne)
     ))
 
-(defun mime-preview/display-header (beg end)
+(defun mime-view-display-header (beg end)
   (save-restriction
     (narrow-to-region (point)(point))
     (insert-buffer-substring mime-raw-buffer beg end)
@@ -566,8 +547,7 @@ The compressed face will be piped to this command.")
     (run-hooks 'mime-view-content-header-filter-hook)
     ))
 
-(defun mime-preview/display-body (beg end
-                                     rcnum cinfo ctype params subj encoding)
+(defun mime-view-display-body (beg end rcnum cinfo ctype params subj encoding)
   (save-restriction
     (narrow-to-region (point-max)(point-max))
     (insert-buffer-substring mime-raw-buffer beg end)
@@ -578,18 +558,18 @@ The compressed face will be piped to this command.")
           )
       )))
 
-(defun mime-preview/display-message/partial ()
+(defun mime-view-insert-message/partial-button ()
   (save-restriction
     (goto-char (point-max))
     (if (not (search-backward "\n\n" nil t))
        (insert "\n")
       )
-    (let ((be (point-max)))
-      (narrow-to-region be be)
-      (insert mime-view-announcement-for-message/partial)
-      (mime-add-button (point-min)(point-max)
-                      (function mime-view-play-current-entity))
-      )))
+    (goto-char (point-max))
+    (narrow-to-region (point-max)(point-max))
+    (insert mime-view-announcement-for-message/partial)
+    (mime-add-button (point-min)(point-max)
+                    (function mime-view-play-current-entity))
+    ))
 
 (defun mime-article/get-uu-filename (param &optional encoding)
   (if (member (or encoding
@@ -619,16 +599,16 @@ The compressed face will be piped to this command.")
       ""))
 
 
-;;; @ content information
+;;; @ entity information
 ;;;
 
 (defun mime-article/point-content-number (p &optional cinfo)
   (or cinfo
-      (setq cinfo mime::article/content-info)
+      (setq cinfo mime-raw-content-info)
       )
-  (let ((b (mime::content-info/point-min cinfo))
-       (e (mime::content-info/point-max cinfo))
-       (c (mime::content-info/children cinfo))
+  (let ((b (mime-entity-info-point-min cinfo))
+       (e (mime-entity-info-point-max cinfo))
+       (c (mime-entity-info-children cinfo))
        )
     (if (and (<= b p)(<= p e))
        (or (let (co ret (sn 0))
@@ -644,27 +624,20 @@ The compressed face will be piped to this command.")
                  )))
            t))))
 
-(defun mime-article/rcnum-to-cinfo (rcnum &optional cinfo)
-  (or cinfo
-      (setq cinfo mime::article/content-info)
-      )
-  (find-if (function
-           (lambda (ci)
-             (equal (mime::content-info/rcnum ci) rcnum)
-             ))
-          (mime/flatten-content-info cinfo)
-          ))
+(defsubst mime-article/rcnum-to-cinfo (rnum &optional cinfo)
+  (mime-article/cnum-to-cinfo (reverse rnum) cinfo)
+  )
 
 (defun mime-article/cnum-to-cinfo (cn &optional cinfo)
   (or cinfo
-      (setq cinfo mime::article/content-info)
+      (setq cinfo mime-raw-content-info)
       )
   (if (eq cn t)
       cinfo
     (let ((sn (car cn)))
       (if (null sn)
          cinfo
-       (let ((rc (nth sn (mime::content-info/children cinfo))))
+       (let ((rc (nth sn (mime-entity-info-children cinfo))))
          (if rc
              (mime-article/cnum-to-cinfo (cdr cn) rc)
            ))
@@ -672,10 +645,10 @@ The compressed face will be piped to this command.")
 
 (defun mime/flatten-content-info (&optional cinfo)
   (or cinfo
-      (setq cinfo mime::article/content-info)
+      (setq cinfo mime-raw-content-info)
       )
   (let ((dest (list cinfo))
-       (rcl (mime::content-info/children cinfo))
+       (rcl (mime-entity-info-children cinfo))
        )
     (while rcl
       (setq dest (nconc dest (mime/flatten-content-info (car rcl))))
@@ -684,6 +657,34 @@ The compressed face will be piped to this command.")
     dest))
 
 
+;;; @@ predicate functions
+;;;
+
+(defun mime-view-header-visible-p (rcnum cinfo)
+  "Return non-nil if header of current entity is visible."
+  (or (null rcnum)
+      (member (mime-entity-info-type/subtype
+              (mime-article/rcnum-to-cinfo (cdr rcnum) cinfo))
+             mime-view-childrens-header-showing-Content-Type-list)
+      ))
+
+(defun mime-view-body-visible-p (rcnum cinfo media-type media-subtype)
+  (let ((ctype (if media-type
+                  (if media-subtype
+                      (format "%s/%s" media-type media-subtype)
+                    (symbol-name media-type)
+                    ))))
+    (and (member ctype mime-view-visible-media-type-list)
+        (if (and (eq media-type 'application)
+                 (eq media-subtype 'octet-stream))
+            (let ((ccinfo (mime-article/rcnum-to-cinfo rcnum cinfo)))
+              (member (mime-entity-info-encoding ccinfo)
+                      '(nil "7bit" "8bit"))
+              )
+          t))
+    ))
+
+
 ;;; @ MIME viewer mode
 ;;;
 
@@ -760,16 +761,26 @@ The compressed face will be piped to this command.")
       "h"        (function mime-view-show-summary))
     (define-key mime-view-mode-map
       "\C-c\C-x" (function mime-view-kill-buffer))
+    ;; (define-key mime-view-mode-map
+    ;;   "<"        (function beginning-of-buffer))
+    ;; (define-key mime-view-mode-map
+    ;;   ">"        (function end-of-buffer))
+    (define-key mime-view-mode-map
+      "?"        (function describe-mode))
     (define-key mime-view-mode-map
-      "<"        (function beginning-of-buffer))
+      [tab] (function mime-view-move-to-next))
     (define-key mime-view-mode-map
-      ">"        (function end-of-buffer))
+      [delete] (function mime-view-scroll-down-entity))
     (define-key mime-view-mode-map
-      "?"        (function describe-mode))
+      [backspace] (function mime-view-scroll-down-entity))
     (if (functionp default)
-       (setq mime-view-mode-map
-             (append mime-view-mode-map (list (cons t default)))
-             ))
+       (cond (running-xemacs
+              (set-keymap-default-binding mime-view-mode-map default)
+              )
+             (t
+              (setq mime-view-mode-map
+                    (append mime-view-mode-map (list (cons t default))))
+              )))
     (if mouse-button-2
        (define-key mime-view-mode-map
          mouse-button-2 (function mime-button-dispatcher))
@@ -796,6 +807,20 @@ The compressed face will be piped to this command.")
     (run-hooks 'mime-view-define-keymap-hook)
     ))
 
+(defsubst mime-maybe-hide-echo-buffer ()
+  "Clear mime-echo buffer and delete window for it."
+  (let ((buf (get-buffer mime-echo-buffer-name)))
+    (if buf
+       (save-excursion
+         (set-buffer buf)
+         (erase-buffer)
+         (let ((win (get-buffer-window buf)))
+           (if win
+               (delete-window win)
+             ))
+         (bury-buffer buf)
+         ))))
+
 (defun mime-view-mode (&optional mother ctl encoding ibuf obuf
                                 default-keymap-or-function)
   "Major mode for viewing MIME message.
@@ -822,13 +847,8 @@ button-2   Move to point under the mouse cursor
                and decode current content as `play mode'
 "
   (interactive)
-  (let ((buf (get-buffer mime/output-buffer-name)))
-    (if buf
-       (save-excursion
-         (set-buffer buf)
-         (erase-buffer)
-         )))
-  (let ((ret (mime-view-setup-buffer ctl encoding ibuf obuf))
+  (mime-maybe-hide-echo-buffer)
+  (let ((ret (mime-view-setup-buffers ctl encoding ibuf obuf))
        (win-conf (current-window-configuration))
        )
     (prog1
@@ -848,13 +868,17 @@ button-2  Move to point under the mouse cursor
       (run-hooks 'mime-view-mode-hook)
       )))
 
+
+;;; @@ playing
+;;;
+
 (autoload 'mime-view-play-current-entity "mime-play" "Play current entity." t)
 
 (defun mime-view-extract-current-entity ()
   "Extract current entity into file (maybe).
 It decodes current entity to call internal or external method as
 \"extract\" mode.  The method is selected from variable
-`mime/content-decoding-condition'."
+`mime-acting-condition'."
   (interactive)
   (mime-view-play-current-entity "extract")
   )
@@ -863,11 +887,26 @@ It decodes current entity to call internal or external method as
   "Print current entity (maybe).
 It decodes current entity to call internal or external method as
 \"print\" mode.  The method is selected from variable
-`mime/content-decoding-condition'."
+`mime-acting-condition'."
   (interactive)
   (mime-view-play-current-entity "print")
   )
 
+
+;;; @@ following
+;;;
+
+(defun mime-view-get-original-major-mode ()
+  "Return major-mode of original buffer.
+If a current buffer has mime-mother-buffer, return original major-mode
+of the mother-buffer."
+  (if mime-mother-buffer
+      (save-excursion
+       (set-buffer mime-mother-buffer)
+       (mime-view-get-original-major-mode)
+       )
+    mime-view-original-major-mode))
+
 (defun mime-view-follow-current-entity ()
   "Write follow message to current entity.
 It calls following-method selected from variable
@@ -880,9 +919,9 @@ It calls following-method selected from variable
       )
     (let* ((p-beg (previous-single-property-change (point) 'mime-view-cinfo))
           p-end
-          (rcnum (mime::content-info/rcnum cinfo))
+          (rcnum (mime-entity-info-rnum cinfo))
           (len (length rcnum))
-          rc)
+          )
       (cond ((null p-beg)
             (setq p-beg
                   (if (eq (next-single-property-change (point-min)
@@ -911,7 +950,7 @@ It calls following-method selected from variable
                                (next-single-property-change
                                 (point) 'mime-view-cinfo))
                     (goto-char e)
-                    (let ((rc (mime::content-info/rcnum
+                    (let ((rc (mime-entity-info-rnum
                                (get-text-property (point)
                                                   'mime-view-cinfo))))
                       (or (equal rcnum (nthcdr (- (length rc) len) rc))
@@ -922,7 +961,7 @@ It calls following-method selected from variable
                 (setq p-end (point-max))
                 ))
             ))
-      (let* ((mode (mime-preview/get-original-major-mode))
+      (let* ((mode (mime-view-get-original-major-mode))
             (new-name (format "%s-%s" (buffer-name) (reverse rcnum)))
             new-buf
             (the-buf (current-buffer))
@@ -942,7 +981,7 @@ It calls following-method selected from variable
          (goto-char (point-min))
          (insert "\n")
          (goto-char (point-min))
-         (let ((rcnum (mime::content-info/rcnum cinfo)) ci str)
+         (let ((rcnum (mime-entity-info-rnum cinfo)) ci str)
            (while (progn
                     (setq str
                           (save-excursion
@@ -950,15 +989,16 @@ It calls following-method selected from variable
                             (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)
+                               (mime-entity-info-point-min ci)
+                               (mime-entity-info-point-max ci)
                                )
                               (std11-header-string-except
                                (concat "^"
                                        (apply (function regexp-or) fields)
                                        ":") ""))))
-                    (if (string= (mime::content-info/type ci)
-                                 "message/rfc822")
+                    (if (and
+                         (eq (mime-entity-info-media-type ci) 'message)
+                         (eq (mime-entity-info-media-subtype ci) 'rfc822))
                         nil
                       (if str
                           (insert str)
@@ -998,6 +1038,10 @@ It calls following-method selected from variable
            ))
        ))))
 
+
+;;; @@ X-Face
+;;;
+
 (defun mime-view-display-x-face ()
   (interactive)
   (save-window-excursion
@@ -1005,6 +1049,10 @@ It calls following-method selected from variable
     (mime-view-x-face-function)
     ))
 
+
+;;; @@ moving
+;;;
+
 (defun mime-view-move-to-upper ()
   "Move to upper entity.
 If there is no upper entity, call function `mime-view-quit'."
@@ -1014,7 +1062,7 @@ If there is no upper entity, call function `mime-view-quit'."
       (backward-char)
       )
     (let ((r (mime-article/rcnum-to-cinfo
-             (cdr (mime::content-info/rcnum cinfo))
+             (cdr (mime-entity-info-rnum cinfo))
              (get-text-property 1 'mime-view-cinfo)))
          point)
       (catch 'tag
@@ -1126,6 +1174,10 @@ If reached to (point-min), it calls function registered in variable
   (mime-view-scroll-down-entity 1)
   )
 
+
+;;; @@ quitting
+;;;
+
 (defun mime-view-quit ()
   "Quit from MIME-View buffer.
 It calls function registered in variable