Rename `mime-view-buffer' -> `mime-preview-buffer'.

[elisp/semi.git] / mime-view.el

diff --git a/mime-view.el b/mime-view.el
index 16a5bb8..bf363dc 100644 (file)
--- a/mime-view.el
+++ b/mime-view.el
@@ -1,15 +1,14 @@
 ;;; mime-view.el --- interactive MIME viewer for GNU Emacs
 
 ;;; 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
 
 ;; 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.70 $

 ;; Keywords: MIME, multimedia, mail, news
 
 ;; 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
 
 ;; 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:
 
 
 ;;; Code:
 

-(require 'cl)

 (require 'std11)
 (require 'mel)
 (require 'eword-decode)
 (require 'std11)
 (require 'mel)
 (require 'eword-decode)

@@ -39,99 +37,73 @@
 ;;; @ version
 ;;;
 
 ;;; @ version
 ;;;
 

-(defconst mime-view-RCS-ID
-  "$Id: mime-view.el,v 0.70 1997-03-18 09:42:17 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
 ;;;
 
 
 
 ;;; @ variables
 ;;;
 

-(defvar mime/content-decoding-condition
-  '(((type . "text/plain")
-     (method "tm-plain" nil 'file 'type 'encoding 'mode 'name)
+(defvar mime-acting-condition
+  '(((type . text)(subtype . plain)
+     (method "tm-plain" nil 'file "" 'encoding 'mode 'name)

      (mode "play" "print")
      )
      (mode "play" "print")
      )

-    ((type . "text/html")
-     (method "tm-html" nil 'file 'type 'encoding 'mode 'name)
+    ((type . text)(subtype . html)
+     (method "tm-html" nil 'file "" 'encoding 'mode 'name)

      (mode . "play")
      )
      (mode . "play")
      )

-    ((type . "text/x-rot13-47")
-     (method . mime-article/decode-caesar)
+    ((type . text)(subtype . x-rot13-47)
+     (method . mime-method-to-display-caesar)

      (mode . "play")
      )
      (mode . "play")
      )

-    ((type . "audio/basic")
-     (method "tm-au"    nil 'file 'type 'encoding 'mode 'name)
+    ((type . text)(subtype . x-rot13-47-48)
+     (method . mime-method-to-display-caesar)

      (mode . "play")
      )
      (mode . "play")
      )

-    
-    ((type . "image/jpeg")
-     (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)
-     (mode "play" "print")
-     )
-    ((type . "image/x-tiff")
-     (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)
-     (mode "play" "print")
-     )
-    ((type . "image/x-pic")
-     (method "tm-image" nil 'file 'type 'encoding 'mode 'name)
-     (mode "play" "print")
+
+    ((type . audio)(subtype . basic)
+     (method "tm-au"    nil 'file "" 'encoding 'mode 'name)
+     (mode . "play")

      )
      )

-    ((type . "image/x-mag")
-     (method "tm-image" nil 'file 'type 'encoding 'mode 'name)
+    
+    ((type . image)
+     (method "tm-image" nil 'file "" 'encoding 'mode 'name)

      (mode "play" "print")
      )
     
      (mode "play" "print")
      )
     

-    ((type . "video/mpeg")
-     (method "tm-mpeg"  nil 'file 'type 'encoding 'mode 'name)
+    ((type . video)(subtype . mpeg)
+     (method "tm-mpeg"  nil 'file "" 'encoding 'mode 'name)

      (mode . "play")
      )
     
      (mode . "play")
      )
     

-    ((type . "application/postscript")
-     (method "tm-ps" nil 'file 'type 'encoding 'mode 'name)
+    ((type . application)(subtype . postscript)
+     (method "tm-ps" nil 'file "" '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")
+    ((type . application)(subtype . octet-stream)
+     (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")
+
+    ((type . message)(subtype . external-body)

      ("access-type" . "anon-ftp")
      ("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)
+    ((type . message)(subtype . rfc822)
+     (method . mime-method-to-display-message/rfc822)

      (mode . "play")
      )
      (mode . "play")
      )

-    ((type . "message/partial")
-     (method . mime-article/decode-message/partial)
+    ((type . message)(subtype . partial)
+     (method . mime-method-to-store-message/partial)

      (mode . "play")
      )
     
     ((method "metamail" t "-m" "tm" "-x" "-d" "-z" "-e" 'file)
      (mode . "play")
      )
      (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
     ))
 
 (defvar mime-view-childrens-header-showing-Content-Type-list

@@ -185,121 +157,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
 ;;;
 
 ;;; @@ 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."
   "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
               (let ((rest

-                     (concat " <" ctype
+                     (format " <%s/%s%s%s>"
+                             media-type media-subtype

                              (if charset
                                  (concat "; " charset)
                              (if charset
                                  (concat "; " charset)

-                               (if encoding (concat " (" encoding ")"))
-                               )
-                             ">]\n")))
+                               "")
+                             (if encoding
+                                 (concat " (" encoding ")")
+                               ""))))

                 (if (>= (+ (current-column)(length rest))(window-width))
                 (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-preview-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)
   "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
 ;;;
 
       ))
 
 
 ;;; @@ 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))
           )
   (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)
                         (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)
 
 (defun mime-view-default-content-header-filter ()
   (mime-view-cut-header)

@@ -313,20 +265,26 @@ Please redefine this function if you want to change default setting."
 ;;;
 
 (defvar mime-view-content-filter-alist
 ;;;
 
 (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
 ;;;
 
 
 
 ;;; @@ 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)
   "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")
       (progn
        (goto-char (point-max))
        (insert "\n")

@@ -339,23 +297,51 @@ Please redefine this function if you want to change default setting."
 ;;; @@@ in raw buffer
 ;;;
 
 ;;; @@@ in raw buffer
 ;;;
 

-(make-variable-buffer-local 'mime::article/content-info)
+(defvar mime-raw-entity-info
+  "Information about structure of message.
+Please use reference function `mime-entity-info-SLOT' to get value of
+SLOT.

 
 

-(defvar mime::article/preview-buffer nil)
-(make-variable-buffer-local 'mime::article/preview-buffer)
+Following is a list of slots of the structure:
+
+rcnum          reversed content-number (list)
+point-min      beginning point of region in raw-buffer
+point-max      end point of region in raw-buffer
+type           media-type (symbol)
+subtype                media-subtype (symbol)
+type/subtype   media-type/subtype (string or nil)
+parameters     parameter of Content-Type field (association list)
+encoding       Content-Transfer-Encoding (string or nil)
+children       entities included in this entity (list of content-infos)
+
+If an entity includes other entities in its body, such as multipart or
+message/rfc822, entity-infos of other entities are included in
+`children', so entity-info become a tree.")
+(make-variable-buffer-local 'mime-raw-entity-info)
+
+(defvar mime-preview-buffer nil
+  "MIME preview buffer corresponding with the (raw) buffer.")
+(make-variable-buffer-local 'mime-preview-buffer)

 
 
 ;;; @@@ in view buffer
 ;;;
 
 
 
 ;;; @@@ in view buffer
 ;;;
 

-(make-variable-buffer-local 'mime::preview/mother-buffer)
-(make-variable-buffer-local 'mime::preview/content-list)
+(defvar mime-mother-buffer nil
+  "Mother buffer corresponding with the (MIME-View) buffer.
+If current MIME-View buffer is generated by other buffer, such as
+message/partial, it is called `mother-buffer'.")
+(make-variable-buffer-local 'mime-mother-buffer)

 
 

-(defvar mime::preview/article-buffer nil)
-(make-variable-buffer-local 'mime::preview/article-buffer)
+(defvar mime-raw-buffer nil
+  "Raw buffer corresponding with the (MIME-View) buffer.")
+(make-variable-buffer-local 'mime-raw-buffer)

 
 

-(make-variable-buffer-local 'mime::preview/original-major-mode)
-(make-variable-buffer-local 'mime::preview/original-window-configuration)
+(defvar mime-preview-original-major-mode nil
+  "Major-mode of mime-raw-buffer.")
+(make-variable-buffer-local 'mime-preview-original-major-mode)
+
+(make-variable-buffer-local 'mime-preview-original-window-configuration)

 
 
 ;;; @@ quitting method
 
 
 ;;; @@ quitting method

@@ -415,82 +401,60 @@ The compressed face will be piped to this 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
-;;;
-
-;;; @@ preview-content-info
-;;;
-
-(define-structure mime::preview-content-info
-  point-min point-max buffer content-info)
-
-

 ;;; @ buffer setup
 ;;;
 
 ;;; @ 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
   (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-entity-info (mime-parse-message ctl encoding))

       )
       )

-  (let ((ret (mime-view-make-preview-buffer obuf)))
-    (setq mime::article/preview-buffer (car ret))
-    ret))
-
-(defun mime-view-make-preview-buffer (&optional obuf)
-  (let* ((cinfo mime::article/content-info)
+  (let* ((cinfo mime-raw-entity-info)

         (pcl (mime/flatten-content-info cinfo))
         (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) "*")))
     (set-buffer (get-buffer-create obuf))
         (the-buf (current-buffer))
         (mode major-mode)
         )
     (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::preview/article-buffer the-buf)
-    (setq mime::preview/original-major-mode mode)
-    (setq major-mode 'mime-view-mode)
-    (setq mode-name "MIME-View")
-    (let ((drest dest))
+    (let ((inhibit-read-only t))
+      ;;(setq buffer-read-only nil)
+      (widen)
+      (erase-buffer)
+      (setq mime-raw-buffer the-buf)
+      (setq mime-preview-original-major-mode mode)
+      (setq major-mode 'mime-view-mode)
+      (setq mode-name "MIME-View")

       (while pcl
       (while pcl

-       (setcar drest
-               (mime-view-display-entity (car pcl) cinfo the-buf obuf))
-       (setq pcl (cdr pcl)
-             drest (cdr drest))
-       ))
-    (set-buffer-modified-p nil)
+       (mime-view-display-entity (car pcl) cinfo the-buf obuf)
+       (setq pcl (cdr pcl))
+       )
+      (set-buffer-modified-p nil)
+      )

     (setq buffer-read-only t)
     (set-buffer the-buf)
     (setq buffer-read-only t)
     (set-buffer the-buf)

-    (list obuf dest)
-    ))
+    )
+  (setq mime-preview-buffer obuf)
+  )

 
 (defun mime-view-display-entity (content cinfo ibuf obuf)
   "Display entity from content-info CONTENT."
 
 (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)
         he e nb ne subj)
     (set-buffer ibuf)
     (goto-char beg)

@@ -509,9 +473,10 @@ The compressed face will be piped to this command.")
     (set-buffer obuf)
     (setq nb (point))
     (narrow-to-region nb nb)
     (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)
     (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
       )
     (if (and (null rcnum)
             (member

@@ -519,39 +484,36 @@ The compressed face will be piped to this command.")
        (save-excursion
          (goto-char (point-max))
          (mime-view-insert-entity-button
        (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)
           )
                                      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)
           )
          ((and (null rcnum)

-               (null (mime::content-info/children cinfo))
+               (null (mime-entity-info-children cinfo))

                )
           (goto-char (point-max))
           (mime-view-insert-entity-button
                )
           (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)
-    (prog1
-       (progn
-         (setq ne (point-max))
-         (widen)
-         (put-text-property nb ne 'mime-view-raw-buffer ibuf)
-         (put-text-property nb ne 'mime-view-cinfo content)
-         (mime::preview-content-info/create nb (1- ne) ibuf content)
-         )
-      (goto-char ne)
-      )))
+    (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)
+    (put-text-property nb ne 'mime-view-cinfo content)
+    (goto-char ne)
+    ))

 
 

-(defun mime-preview/display-header (beg end)
+(defun mime-view-display-header (beg end)

   (save-restriction
     (narrow-to-region (point)(point))
   (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
+    (insert-buffer-substring mime-raw-buffer beg end)
+    (let ((f (cdr (assq mime-preview-original-major-mode

                        mime-view-content-header-filter-alist))))
       (if (functionp f)
          (funcall f)
                        mime-view-content-header-filter-alist))))
       (if (functionp f)
          (funcall f)

@@ -560,11 +522,10 @@ The compressed face will be piped to this command.")
     (run-hooks 'mime-view-content-header-filter-hook)
     ))
 
     (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))
   (save-restriction
     (narrow-to-region (point-max)(point-max))

-    (insert-buffer-substring mime::preview/article-buffer beg end)
+    (insert-buffer-substring mime-raw-buffer beg end)

     (let ((f (cdr (or (assoc ctype mime-view-content-filter-alist)
                      (assq t mime-view-content-filter-alist)))))
       (and (functionp f)
     (let ((f (cdr (or (assoc ctype mime-view-content-filter-alist)
                      (assq t mime-view-content-filter-alist)))))
       (and (functionp f)

@@ -572,18 +533,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")
       )
   (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-preview-play-current-entity))
+    ))

 
 (defun mime-article/get-uu-filename (param &optional encoding)
   (if (member (or encoding
 
 (defun mime-article/get-uu-filename (param &optional encoding)
   (if (member (or encoding

@@ -613,16 +574,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
 ;;;
 
 (defun mime-article/point-content-number (p &optional cinfo)
   (or cinfo

-      (setq cinfo mime::article/content-info)
+      (setq cinfo mime-raw-entity-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))
        )
     (if (and (<= b p)(<= p e))
        (or (let (co ret (sn 0))

@@ -638,27 +599,20 @@ The compressed face will be piped to this command.")
                  )))
            t))))
 
                  )))
            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
 
 (defun mime-article/cnum-to-cinfo (cn &optional cinfo)
   (or cinfo

-      (setq cinfo mime::article/content-info)
+      (setq cinfo mime-raw-entity-info)

       )
   (if (eq cn t)
       cinfo
     (let ((sn (car cn)))
       (if (null sn)
          cinfo
       )
   (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)
            ))
          (if rc
              (mime-article/cnum-to-cinfo (cdr cn) rc)
            ))

@@ -666,10 +620,10 @@ The compressed face will be piped to this command.")
 
 (defun mime/flatten-content-info (&optional cinfo)
   (or cinfo
 
 (defun mime/flatten-content-info (&optional cinfo)
   (or cinfo

-      (setq cinfo mime::article/content-info)
+      (setq cinfo mime-raw-entity-info)

       )
   (let ((dest (list cinfo))
       )
   (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))))
        )
     (while rcl
       (setq dest (nconc dest (mime/flatten-content-info (car rcl))))

@@ -678,20 +632,48 @@ The compressed face will be piped to this command.")
     dest))
 
 
     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
 ;;;
 
 (defconst mime-view-menu-title "MIME-View")
 (defconst mime-view-menu-list
 ;;; @ MIME viewer mode
 ;;;
 
 (defconst mime-view-menu-title "MIME-View")
 (defconst mime-view-menu-list

-  '((up                 "Move to upper content"      mime-view-move-to-upper)
-    (previous   "Move to previous content"   mime-view-move-to-previous)
-    (next       "Move to next content"       mime-view-move-to-next)
-    (scroll-down "Scroll to previous content" mime-view-scroll-down-entity)
-    (scroll-up  "Scroll to next content"     mime-view-scroll-up-entity)
-    (play       "Play Content"               mime-view-play-current-entity)
-    (extract    "Extract Content"            mime-view-extract-current-entity)
-    (print      "Print"                      mime-view-print-current-entity)
-    (x-face     "Show X Face"                mime-view-display-x-face)
+  '((up                 "Move to upper entity"    mime-preview-move-to-upper)
+    (previous   "Move to previous entity" mime-preview-move-to-previous)
+    (next       "Move to next entity"     mime-preview-move-to-next)
+    (scroll-down "Scroll-down"             mime-preview-scroll-down-entity)
+    (scroll-up  "Scroll-up"               mime-preview-scroll-up-entity)
+    (play       "Play current entity"     mime-preview-play-current-entity)
+    (extract    "Extract current entity"  mime-preview-extract-current-entity)
+    (print      "Print current entity"    mime-preview-print-current-entity)
+    (x-face     "Show X Face"             mime-view-display-x-face)

     )
   "Menu for MIME Viewer")
 
     )
   "Menu for MIME Viewer")
 

@@ -721,49 +703,59 @@ The compressed face will be piped to this command.")
                              (make-sparse-keymap)
                              )))
     (define-key mime-view-mode-map
                              (make-sparse-keymap)
                              )))
     (define-key mime-view-mode-map

-      "u"        (function mime-view-move-to-upper))
+      "u"        (function mime-preview-move-to-upper))

     (define-key mime-view-mode-map
     (define-key mime-view-mode-map

-      "p"        (function mime-view-move-to-previous))
+      "p"        (function mime-preview-move-to-previous))

     (define-key mime-view-mode-map
     (define-key mime-view-mode-map

-      "n"        (function mime-view-move-to-next))
+      "n"        (function mime-preview-move-to-next))

     (define-key mime-view-mode-map
     (define-key mime-view-mode-map

-      "\e\t"     (function mime-view-move-to-previous))
+      "\e\t"     (function mime-preview-move-to-previous))

     (define-key mime-view-mode-map
     (define-key mime-view-mode-map

-      "\t"       (function mime-view-move-to-next))
+      "\t"       (function mime-preview-move-to-next))

     (define-key mime-view-mode-map
     (define-key mime-view-mode-map

-      " "        (function mime-view-scroll-up-entity))
+      " "        (function mime-preview-scroll-up-entity))

     (define-key mime-view-mode-map
     (define-key mime-view-mode-map

-      "\M- "     (function mime-view-scroll-down-entity))
+      "\M- "     (function mime-preview-scroll-down-entity))

     (define-key mime-view-mode-map
     (define-key mime-view-mode-map

-      "\177"     (function mime-view-scroll-down-entity))
+      "\177"     (function mime-preview-scroll-down-entity))

     (define-key mime-view-mode-map
     (define-key mime-view-mode-map

-      "\C-m"     (function mime-view-next-line-content))
+      "\C-m"     (function mime-preview-next-line-entity))

     (define-key mime-view-mode-map
     (define-key mime-view-mode-map

-      "\C-\M-m"  (function mime-view-previous-line-content))
+      "\C-\M-m"  (function mime-preview-previous-line-entity))

     (define-key mime-view-mode-map
     (define-key mime-view-mode-map

-      "v"        (function mime-view-play-current-entity))
+      "v"        (function mime-preview-play-current-entity))

     (define-key mime-view-mode-map
     (define-key mime-view-mode-map

-      "e"        (function mime-view-extract-current-entity))
+      "e"        (function mime-preview-extract-current-entity))

     (define-key mime-view-mode-map
     (define-key mime-view-mode-map

-      "\C-c\C-p" (function mime-view-print-current-entity))
+      "\C-c\C-p" (function mime-preview-print-current-entity))

     (define-key mime-view-mode-map
     (define-key mime-view-mode-map

-      "a"        (function mime-view-follow-current-entity))
+      "a"        (function mime-preview-follow-current-entity))

     (define-key mime-view-mode-map
     (define-key mime-view-mode-map

-      "q"        (function mime-view-quit))
+      "q"        (function mime-preview-quit))

     (define-key mime-view-mode-map
     (define-key mime-view-mode-map

-      "h"        (function mime-view-show-summary))
+      "h"        (function mime-preview-show-summary))

     (define-key mime-view-mode-map
     (define-key mime-view-mode-map

-      "\C-c\C-x" (function mime-view-kill-buffer))
+      "\C-c\C-x" (function mime-preview-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
     (define-key mime-view-mode-map

-      "<"        (function beginning-of-buffer))
+      "?"        (function describe-mode))

     (define-key mime-view-mode-map
     (define-key mime-view-mode-map

-      ">"        (function end-of-buffer))
+      [tab] (function mime-preview-move-to-next))

     (define-key mime-view-mode-map
     (define-key mime-view-mode-map

-      "?"        (function describe-mode))
+      [delete] (function mime-preview-scroll-down-entity))
+    (define-key mime-view-mode-map
+      [backspace] (function mime-preview-scroll-down-entity))

     (if (functionp default)
     (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))
     (if mouse-button-2
        (define-key mime-view-mode-map
          mouse-button-2 (function mime-button-dispatcher))

@@ -790,6 +782,20 @@ The compressed face will be piped to this command.")
     (run-hooks 'mime-view-define-keymap-hook)
     ))
 
     (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.
 (defun mime-view-mode (&optional mother ctl encoding ibuf obuf
                                 default-keymap-or-function)
   "Major mode for viewing MIME message.

@@ -816,24 +822,18 @@ button-2  Move to point under the mouse cursor
                and decode current content as `play mode'
 "
   (interactive)
                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
        (win-conf (current-window-configuration))
        )
     (prog1

-       (switch-to-buffer (car ret))
-      (setq mime::preview/original-window-configuration win-conf)
+       (switch-to-buffer ret)
+      (setq mime-preview-original-window-configuration win-conf)

       (if mother
          (progn
       (if mother
          (progn

-           (setq mime::preview/mother-buffer mother)
+           (setq mime-mother-buffer mother)

            ))
       (mime-view-define-keymap default-keymap-or-function)
            ))
       (mime-view-define-keymap default-keymap-or-function)

-      (setq mime::preview/content-list (nth 1 ret))

       (let ((point (next-single-property-change (point-min) 'mime-view-cinfo)))
        (if point
            (goto-char point)
       (let ((point (next-single-property-change (point-min) 'mime-view-cinfo)))
        (if point
            (goto-char point)

@@ -843,27 +843,47 @@ button-2  Move to point under the mouse cursor
       (run-hooks 'mime-view-mode-hook)
       )))
 
       (run-hooks 'mime-view-mode-hook)
       )))
 

-(autoload 'mime-view-play-current-entity "mime-play" "Play current entity." t)

 
 

-(defun mime-view-extract-current-entity ()
+;;; @@ playing
+;;;
+
+(autoload 'mime-preview-play-current-entity "mime-play"
+  "Play current entity." t)
+
+(defun mime-preview-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
   "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)
   (interactive)

-  (mime-view-play-current-entity "extract")
+  (mime-preview-play-current-entity "extract")

   )
 
   )
 

-(defun mime-view-print-current-entity ()
+(defun mime-preview-print-current-entity ()

   "Print current entity (maybe).
 It decodes current entity to call internal or external method as
 \"print\" mode.  The method is selected from variable
   "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)
   (interactive)

-  (mime-view-play-current-entity "print")
+  (mime-preview-play-current-entity "print")

   )
 
   )
 

-(defun mime-view-follow-current-entity ()
+
+;;; @@ 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-preview-original-major-mode))
+
+(defun mime-preview-follow-current-entity ()

   "Write follow message to current entity.
 It calls following-method selected from variable
 `mime-view-following-method-alist'."
   "Write follow message to current entity.
 It calls following-method selected from variable
 `mime-view-following-method-alist'."

@@ -875,9 +895,9 @@ It calls following-method selected from variable
       )
     (let* ((p-beg (previous-single-property-change (point) 'mime-view-cinfo))
           p-end
       )
     (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))
           (len (length rcnum))

-          rc)
+          )

       (cond ((null p-beg)
             (setq p-beg
                   (if (eq (next-single-property-change (point-min)
       (cond ((null p-beg)
             (setq p-beg
                   (if (eq (next-single-property-change (point-min)

@@ -906,7 +926,7 @@ It calls following-method selected from variable
                                (next-single-property-change
                                 (point) 'mime-view-cinfo))
                     (goto-char e)
                                (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))
                                (get-text-property (point)
                                                   'mime-view-cinfo))))
                       (or (equal rcnum (nthcdr (- (length rc) len) rc))

@@ -917,11 +937,11 @@ It calls following-method selected from variable
                 (setq p-end (point-max))
                 ))
             ))
                 (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))
             (new-name (format "%s-%s" (buffer-name) (reverse rcnum)))
             new-buf
             (the-buf (current-buffer))

-            (a-buf mime::preview/article-buffer)
+            (a-buf mime-raw-buffer)

             fields)
        (save-excursion
          (set-buffer (setq new-buf (get-buffer-create new-name)))
             fields)
        (save-excursion
          (set-buffer (setq new-buf (get-buffer-create new-name)))

@@ -937,7 +957,7 @@ It calls following-method selected from variable
          (goto-char (point-min))
          (insert "\n")
          (goto-char (point-min))
          (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
            (while (progn
                     (setq str
                           (save-excursion

@@ -945,15 +965,16 @@ It calls following-method selected from variable
                             (setq ci (mime-article/rcnum-to-cinfo rcnum))
                             (save-restriction
                               (narrow-to-region
                             (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)
                                        ":") ""))))
                                )
                               (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)
                         nil
                       (if str
                           (insert str)

@@ -973,8 +994,8 @@ It calls following-method selected from variable
                              ": "
                              (save-excursion
                                (set-buffer the-buf)
                              ": "
                              (save-excursion
                                (set-buffer the-buf)

-                               (set-buffer mime::preview/mother-buffer)
-                               (set-buffer mime::preview/article-buffer)
+                               (set-buffer mime-mother-buffer)
+                               (set-buffer mime-raw-buffer)

                                (std11-field-body field-name)
                                )
                              "\n")))
                                (std11-field-body field-name)
                                )
                              "\n")))

@@ -993,23 +1014,31 @@ It calls following-method selected from variable
            ))
        ))))
 
            ))
        ))))
 

+
+;;; @@ X-Face
+;;;
+

 (defun mime-view-display-x-face ()
   (interactive)
   (save-window-excursion
 (defun mime-view-display-x-face ()
   (interactive)
   (save-window-excursion

-    (set-buffer mime::preview/article-buffer)
+    (set-buffer mime-raw-buffer)

     (mime-view-x-face-function)
     ))
 
     (mime-view-x-face-function)
     ))
 

-(defun mime-view-move-to-upper ()
+
+;;; @@ moving
+;;;
+
+(defun mime-preview-move-to-upper ()

   "Move to upper entity.
   "Move to upper entity.

-If there is no upper entity, call function `mime-view-quit'."
+If there is no upper entity, call function `mime-preview-quit'."

   (interactive)
   (let (cinfo)
     (while (null (setq cinfo (get-text-property (point) 'mime-view-cinfo)))
       (backward-char)
       )
     (let ((r (mime-article/rcnum-to-cinfo
   (interactive)
   (let (cinfo)
     (while (null (setq cinfo (get-text-property (point) 'mime-view-cinfo)))
       (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
              (get-text-property 1 'mime-view-cinfo)))
          point)
       (catch 'tag

@@ -1020,10 +1049,10 @@ If there is no upper entity, call function `mime-view-quit'."
              (throw 'tag t)
            )
          )
              (throw 'tag t)
            )
          )

-       (mime-view-quit)
+       (mime-preview-quit)

        ))))
 
        ))))
 

-(defun mime-view-move-to-previous ()
+(defun mime-preview-move-to-previous ()

   "Move to previous entity.
 If there is no previous entity, it calls function registered in
 variable `mime-view-over-to-previous-method-alist'."
   "Move to previous entity.
 If there is no previous entity, it calls function registered in
 variable `mime-view-over-to-previous-method-alist'."

@@ -1034,14 +1063,14 @@ variable `mime-view-over-to-previous-method-alist'."
   (let ((point (previous-single-property-change (point) 'mime-view-cinfo)))
     (if point
        (goto-char point)
   (let ((point (previous-single-property-change (point) 'mime-view-cinfo)))
     (if point
        (goto-char point)

-      (let ((f (assq mime::preview/original-major-mode
+      (let ((f (assq mime-preview-original-major-mode

                     mime-view-over-to-previous-method-alist)))
        (if f
            (funcall (cdr f))
          ))
       )))
 
                     mime-view-over-to-previous-method-alist)))
        (if f
            (funcall (cdr f))
          ))
       )))
 

-(defun mime-view-move-to-next ()
+(defun mime-preview-move-to-next ()

   "Move to next entity.
 If there is no previous entity, it calls function registered in
 variable `mime-view-over-to-next-method-alist'."
   "Move to next entity.
 If there is no previous entity, it calls function registered in
 variable `mime-view-over-to-next-method-alist'."

@@ -1049,14 +1078,14 @@ variable `mime-view-over-to-next-method-alist'."
   (let ((point (next-single-property-change (point) 'mime-view-cinfo)))
     (if point
        (goto-char point)
   (let ((point (next-single-property-change (point) 'mime-view-cinfo)))
     (if point
        (goto-char point)

-      (let ((f (assq mime::preview/original-major-mode
+      (let ((f (assq mime-preview-original-major-mode

                     mime-view-over-to-next-method-alist)))
        (if f
            (funcall (cdr f))
          ))
       )))
 
                     mime-view-over-to-next-method-alist)))
        (if f
            (funcall (cdr f))
          ))
       )))
 

-(defun mime-view-scroll-up-entity (&optional h)
+(defun mime-preview-scroll-up-entity (&optional h)

   "Scroll up current entity.
 If reached to (point-max), it calls function registered in variable
 `mime-view-over-to-next-method-alist'."
   "Scroll up current entity.
 If reached to (point-max), it calls function registered in variable
 `mime-view-over-to-next-method-alist'."

@@ -1065,7 +1094,7 @@ If reached to (point-max), it calls function registered in variable
       (setq h (1- (window-height)))
       )
   (if (= (point) (point-max))
       (setq h (1- (window-height)))
       )
   (if (= (point) (point-max))

-      (let ((f (assq mime::preview/original-major-mode
+      (let ((f (assq mime-preview-original-major-mode

                      mime-view-over-to-next-method-alist)))
         (if f
             (funcall (cdr f))
                      mime-view-over-to-next-method-alist)))
         (if f
             (funcall (cdr f))

@@ -1079,7 +1108,7 @@ If reached to (point-max), it calls function registered in variable
         )
       )))
 
         )
       )))
 

-(defun mime-view-scroll-down-entity (&optional h)
+(defun mime-preview-scroll-down-entity (&optional h)

   "Scroll down current entity.
 If reached to (point-min), it calls function registered in variable
 `mime-view-over-to-previous-method-alist'."
   "Scroll down current entity.
 If reached to (point-min), it calls function registered in variable
 `mime-view-over-to-previous-method-alist'."

@@ -1088,7 +1117,7 @@ If reached to (point-min), it calls function registered in variable
       (setq h (1- (window-height)))
       )
   (if (= (point) (point-min))
       (setq h (1- (window-height)))
       )
   (if (= (point) (point-min))

-      (let ((f (assq mime::preview/original-major-mode
+      (let ((f (assq mime-preview-original-major-mode

                      mime-view-over-to-previous-method-alist)))
         (if f
             (funcall (cdr f))
                      mime-view-over-to-previous-method-alist)))
         (if f
             (funcall (cdr f))

@@ -1111,39 +1140,43 @@ If reached to (point-min), it calls function registered in variable
           (goto-char point)
         ))))
 
           (goto-char point)
         ))))
 

-(defun mime-view-next-line-content ()
+(defun mime-preview-next-line-entity ()

   (interactive)
   (interactive)

-  (mime-view-scroll-up-entity 1)
+  (mime-preview-scroll-up-entity 1)

   )
 
   )
 

-(defun mime-view-previous-line-content ()
+(defun mime-preview-previous-line-entity ()

   (interactive)
   (interactive)

-  (mime-view-scroll-down-entity 1)
+  (mime-preview-scroll-down-entity 1)

   )
 
   )
 

-(defun mime-view-quit ()
+
+;;; @@ quitting
+;;;
+
+(defun mime-preview-quit ()

   "Quit from MIME-View buffer.
 It calls function registered in variable
 `mime-view-quitting-method-alist'."
   (interactive)
   "Quit from MIME-View buffer.
 It calls function registered in variable
 `mime-view-quitting-method-alist'."
   (interactive)

-  (let ((r (assq mime::preview/original-major-mode
+  (let ((r (assq mime-preview-original-major-mode

                 mime-view-quitting-method-alist)))
     (if r
        (funcall (cdr r))
       )))
 
                 mime-view-quitting-method-alist)))
     (if r
        (funcall (cdr r))
       )))
 

-(defun mime-view-show-summary ()
+(defun mime-preview-show-summary ()

   "Show summary.
 It calls function registered in variable
 `mime-view-show-summary-method'."
   (interactive)
   "Show summary.
 It calls function registered in variable
 `mime-view-show-summary-method'."
   (interactive)

-  (let ((r (assq mime::preview/original-major-mode
+  (let ((r (assq mime-preview-original-major-mode

                 mime-view-show-summary-method)))
     (if r
        (funcall (cdr r))
       )))
 
                 mime-view-show-summary-method)))
     (if r
        (funcall (cdr r))
       )))
 

-(defun mime-view-kill-buffer ()
+(defun mime-preview-kill-buffer ()

   (interactive)
   (kill-buffer (current-buffer))
   )
   (interactive)
   (kill-buffer (current-buffer))
   )