rearrangement.

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

diff --git a/mime-view.el b/mime-view.el
index e3064fe..8c7fb6d 100644 (file)
--- a/mime-view.el
+++ b/mime-view.el
@@ -3,8 +3,8 @@
 ;; Copyright (C) 1995,1996,1997,1998 Free Software Foundation, Inc.
 
 ;; Author: MORIOKA Tomohiko <morioka@jaist.ac.jp>
 ;; 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
+;; Created: 1994/07/13
+;;     Renamed: 1994/08/31 from tm-body.el

 ;;     Renamed: 1997/02/19 from tm-view.el
 ;; Keywords: MIME, multimedia, mail, news
 
 ;;     Renamed: 1997/02/19 from tm-view.el
 ;; Keywords: MIME, multimedia, mail, news
 

@@ -31,16 +31,37 @@
 (require 'mel)
 (require 'eword-decode)
 (require 'mime-parse)
 (require 'mel)
 (require 'eword-decode)
 (require 'mime-parse)

-(require 'mime-text)
+(require 'semi-def)
+(require 'calist)
+(require 'alist)
+(require 'mailcap)

 
 
 ;;; @ version
 ;;;
 
 (defconst mime-view-version-string
 
 
 ;;; @ version
 ;;;
 
 (defconst mime-view-version-string

-  `,(concat "SEMI MIME-View "
-           (mapconcat #'number-to-string (cdr semi-version) ".")
-           " (" (car semi-version) ")"))
+  `,(concat (car mime-module-version) " MIME-View "
+           (mapconcat #'number-to-string (cddr mime-module-version) ".")
+           " (" (cadr mime-module-version) ")"))
+
+
+;;; @ variables
+;;;
+
+(defgroup mime-view nil
+  "MIME view mode"
+  :group 'mime)
+
+(defcustom mime-view-find-every-acting-situation t
+  "*Find every available acting-situation if non-nil."
+  :group 'mime-view
+  :type 'boolean)
+
+(defcustom mime-acting-situation-examples-file "~/.mime-example"
+  "*File name of example about acting-situation demonstrated by user."
+  :group 'mime-view
+  :type 'file)

 
 
 ;;; @ buffer local variables
 
 
 ;;; @ buffer local variables

@@ -49,32 +70,57 @@
 ;;; @@ in raw-buffer
 ;;;
 
 ;;; @@ in raw-buffer
 ;;;
 

-(defvar mime-raw-message-info
+(defvar mime-raw-message-info nil

   "Information about structure of message.
 Please use reference function `mime-entity-SLOT' to get value of SLOT.
 
 Following is a list of slots of the structure:
 
   "Information about structure of message.
 Please use reference function `mime-entity-SLOT' to get value of SLOT.
 
 Following is a list of slots of the structure:
 

-node-id                reversed entity-number (list of integers or t)
-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)
+buffer                 buffer includes this entity (buffer).
+node-id                        node-id (list of integers)
+header-start           minimum point of header in raw-buffer
+header-end             maximum point of header in raw-buffer
+body-start             minimum point of body in raw-buffer
+body-end               maximum point of body in raw-buffer
+content-type           content-type (content-type)
+content-disposition    content-disposition (content-disposition)
+encoding               Content-Transfer-Encoding (string or nil)
+children               entities included in this entity (list of entity)

 
 If an entity includes other entities in its body, such as multipart or
 
 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.")
+message/rfc822, `mime-entity' structures of them are included in
+`children', so the `mime-entity' structure become a tree.")

 (make-variable-buffer-local 'mime-raw-message-info)
 
 (make-variable-buffer-local 'mime-raw-message-info)
 

+

 (defvar mime-preview-buffer nil
   "MIME-preview buffer corresponding with the (raw) buffer.")
 (make-variable-buffer-local 'mime-preview-buffer)
 
 
 (defvar mime-preview-buffer nil
   "MIME-preview buffer corresponding with the (raw) buffer.")
 (make-variable-buffer-local 'mime-preview-buffer)
 
 

+(defvar mime-raw-representation-type nil
+  "Representation-type of mime-raw-buffer.
+It must be nil, `binary' or `cooked'.
+If it is nil, `mime-raw-representation-type-alist' is used as default
+value.
+Notice that this variable is usually used as buffer local variable in
+raw-buffer.")
+
+(make-variable-buffer-local 'mime-raw-representation-type)
+
+(defvar mime-raw-representation-type-alist
+  '((mime-show-message-mode     . binary)
+    (mime-temp-message-mode     . binary)
+    (t                          . cooked)
+    )
+  "Alist of major-mode vs. representation-type of mime-raw-buffer.
+Each element looks like (SYMBOL . REPRESENTATION-TYPE).  SYMBOL is
+major-mode or t.  t means default.  REPRESENTATION-TYPE must be
+`binary' or `cooked'.
+This value is overridden by buffer local variable
+`mime-raw-representation-type' if it is not nil.")
+
+

 ;;; @@ in preview-buffer
 ;;;
 
 ;;; @@ in preview-buffer
 ;;;
 

@@ -92,16 +138,123 @@ message/partial, it is called `mother-buffer'.")
   "Major-mode of mime-raw-buffer.")
 (make-variable-buffer-local 'mime-preview-original-major-mode)
 
   "Major-mode of mime-raw-buffer.")
 (make-variable-buffer-local 'mime-preview-original-major-mode)
 

+(defvar mime-preview-original-window-configuration nil
+  "Window-configuration before mime-view-mode is called.")

 (make-variable-buffer-local 'mime-preview-original-window-configuration)
 
 
 (make-variable-buffer-local 'mime-preview-original-window-configuration)
 
 

-;;; @ entity button
+;;; @ entity information
+;;;
+
+(defsubst mime-raw-find-entity-from-node-id (entity-node-id
+                                            &optional message-info)
+  "Return entity from ENTITY-NODE-ID in mime-raw-buffer.
+If optional argument MESSAGE-INFO is not specified,
+`mime-raw-message-info' is used."
+  (mime-raw-find-entity-from-number (reverse entity-node-id) message-info))
+
+(defun mime-raw-find-entity-from-number (entity-number &optional message-info)
+  "Return entity from ENTITY-NUMBER in mime-raw-buffer.
+If optional argument MESSAGE-INFO is not specified,
+`mime-raw-message-info' is used."
+  (or message-info
+      (setq message-info mime-raw-message-info))
+  (if (eq entity-number t)
+      message-info
+    (let ((sn (car entity-number)))
+      (if (null sn)
+         message-info
+       (let ((rc (nth sn (mime-entity-children message-info))))
+         (if rc
+             (mime-raw-find-entity-from-number (cdr entity-number) rc)
+           ))
+       ))))
+
+(defun mime-raw-find-entity-from-point (point &optional message-info)
+  "Return entity from POINT in mime-raw-buffer.
+If optional argument MESSAGE-INFO is not specified,
+`mime-raw-message-info' is used."
+  (or message-info
+      (setq message-info mime-raw-message-info))
+  (if (and (<= (mime-entity-point-min message-info) point)
+          (<= point (mime-entity-point-max message-info)))
+      (let ((children (mime-entity-children message-info)))
+       (catch 'tag
+         (while children
+           (let ((ret
+                  (mime-raw-find-entity-from-point point (car children))))
+             (if ret
+                 (throw 'tag ret)
+               ))
+           (setq children (cdr children)))
+         message-info))))
+
+(defsubst mime-entity-parent (entity &optional message-info)
+  "Return mother entity of ENTITY.
+If optional argument MESSAGE-INFO is not specified,
+`mime-raw-message-info' in buffer of ENTITY is used."
+  (mime-raw-find-entity-from-node-id
+   (cdr (mime-entity-node-id entity))
+   (or message-info
+       (save-excursion
+        (set-buffer (mime-entity-buffer entity))
+        mime-raw-message-info))))
+
+(defsubst mime-raw-point-to-entity-node-id (point &optional message-info)
+  "Return entity-node-id from POINT in mime-raw-buffer.
+If optional argument MESSAGE-INFO is not specified,
+`mime-raw-message-info' is used."
+  (mime-entity-node-id (mime-raw-find-entity-from-point point message-info)))
+
+(defsubst mime-raw-point-to-entity-number (point &optional message-info)
+  "Return entity-number from POINT in mime-raw-buffer.
+If optional argument MESSAGE-INFO is not specified,
+`mime-raw-message-info' is used."
+  (mime-entity-number (mime-raw-find-entity-from-point point message-info)))
+
+(defun mime-raw-flatten-message-info (&optional message-info)
+  "Return list of entity in mime-raw-buffer.
+If optional argument MESSAGE-INFO is not specified,
+`mime-raw-message-info' is used."
+  (or message-info
+      (setq message-info mime-raw-message-info))
+  (let ((dest (list message-info))
+       (rcl (mime-entity-children message-info)))
+    (while rcl
+      (setq dest (nconc dest (mime-raw-flatten-message-info (car rcl))))
+      (setq rcl (cdr rcl)))
+    dest))
+
+
+;;; @ presentation of preview
+;;;
+
+;;; @@ entity-button
+;;;
+
+;;; @@@ predicate function

 ;;;
 
 ;;;
 

-(defvar mime-view-content-button-visible-ctype-list
-  '("application/pgp"))
+(defun mime-view-entity-button-visible-p (entity)
+  "Return non-nil if header of ENTITY is visible.
+Please redefine this function if you want to change default setting."
+  (let ((media-type (mime-entity-media-type entity))
+       (media-subtype (mime-entity-media-subtype entity)))
+    (or (not (eq media-type 'application))
+       (and (not (eq media-subtype 'x-selection))
+            (or (not (eq media-subtype 'octet-stream))
+                (let ((mother-entity (mime-entity-parent entity)))
+                  (or (not (eq (mime-entity-media-type mother-entity)
+                               'multipart))
+                      (not (eq (mime-entity-media-subtype mother-entity)
+                               'encrypted)))
+                  )
+                )))))
+
+;;; @@@ entity button generator
+;;;

 
 

-(defun mime-view-insert-entity-button (entity message-info subj)
+(defun mime-view-insert-entity-button (entity subject)

   "Insert entity-button of ENTITY."
   (let ((entity-node-id (mime-entity-node-id entity))
        (params (mime-entity-parameters entity)))
   "Insert entity-button of ENTITY."
   (let ((entity-node-id (mime-entity-node-id entity))
        (params (mime-entity-parameters entity)))

@@ -121,12 +274,12 @@ message/partial, it is called `mother-buffer'.")
                (setq access-type (cdr access-type))
                (if server
                    (format "%s %s ([%s] %s)"
                (setq access-type (cdr access-type))
                (if server
                    (format "%s %s ([%s] %s)"

-                           num subj access-type (cdr server))
+                           num subject access-type (cdr server))

                (let ((site (cdr (assoc "site" params)))
                      (dir (cdr (assoc "directory" params)))
                      )
                  (format "%s %s ([%s] %s:%s)"
                (let ((site (cdr (assoc "site" params)))
                      (dir (cdr (assoc "directory" params)))
                      )
                  (format "%s %s ([%s] %s:%s)"

-                         num subj access-type site dir)
+                         num subject access-type site dir)

                  )))
            )
           (t
                  )))
            )
           (t

@@ -135,7 +288,7 @@ message/partial, it is called `mother-buffer'.")
                  (charset (cdr (assoc "charset" params)))
                  (encoding (mime-entity-encoding entity)))
              (concat
                  (charset (cdr (assoc "charset" params)))
                  (encoding (mime-entity-encoding entity)))
              (concat

-              num " " subj
+              num " " subject

               (let ((rest
                      (format " <%s/%s%s%s>"
                              media-type media-subtype
               (let ((rest
                      (format " <%s/%s%s%s>"
                              media-type media-subtype

@@ -152,48 +305,11 @@ message/partial, it is called `mother-buffer'.")
      (function mime-preview-play-current-entity))
     ))
 
      (function mime-preview-play-current-entity))
     ))
 

-(defun mime-view-entity-button-function (entity message-info subj)
-  "Insert entity-button of ENTITY conditionally.
-Please redefine this function if you want to change default setting."
-  (let ((entity-node-id (mime-entity-node-id entity))
-       (media-type (mime-entity-media-type entity))
-       (media-subtype (mime-entity-media-subtype entity)))
-    (or (null entity-node-id)
-       (and (eq media-type 'application)
-            (or (eq media-subtype 'x-selection)
-                (and (eq media-subtype 'octet-stream)
-                     (let ((mother-entity
-                            (mime-raw-find-entity-from-node-id
-                             (cdr entity-node-id) message-info)))
-                       (and (eq (mime-entity-media-type mother-entity)
-                                'multipart)
-                            (eq (mime-entity-media-subtype mother-entity)
-                                'encrypted)
-                            )))))
-       (mime-view-insert-entity-button entity message-info subj)
-       )))
-
-
-;;; @ entity header
-;;;

 
 

-;;; @@ predicate function
+;;; @@ entity-header

 ;;;
 
 ;;;
 

-(defvar mime-view-childrens-header-showing-Content-Type-list
-  '("message/rfc822" "message/news"))
-
-(defun mime-view-header-visible-p (entity message-info)
-  "Return non-nil if header of ENTITY is visible."
-  (let ((entity-node-id (mime-entity-node-id entity)))
-    (or (null entity-node-id)
-       (member (mime-entity-type/subtype
-                (mime-raw-find-entity-from-node-id
-                 (cdr entity-node-id) message-info))
-               mime-view-childrens-header-showing-Content-Type-list)
-       )))
-
-;;; @@ entity header filter
+;;; @@@ entity header filter

 ;;;
 
 (defvar mime-view-content-header-filter-alist nil)
 ;;;
 
 (defvar mime-view-content-header-filter-alist nil)

@@ -203,20 +319,7 @@ Please redefine this function if you want to change default setting."
   (eword-decode-header)
   )
 
   (eword-decode-header)
   )
 

-(defun mime-view-display-header (beg end)
-  (save-restriction
-    (narrow-to-region (point)(point))
-    (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-default-content-header-filter)
-       ))
-    (run-hooks 'mime-view-content-header-filter-hook)
-    ))
-
-;;; @@ entity field cutter
+;;; @@@ entity field cutter

 ;;;
 
 (defvar mime-view-ignored-field-list
 ;;;
 
 (defvar mime-view-ignored-field-list

@@ -259,60 +362,122 @@ Each elements are regexp of field-name.")
        ))))
 
 
        ))))
 
 

-;;; @ entity-body
+;;; @@ entity-body

 ;;;
 
 ;;;
 

-;;; @@ predicate function
+;;; @@@ predicate function

 ;;;
 
 ;;;
 

-(defvar mime-view-visible-media-type-list
-  '("text/plain" nil "text/richtext" "text/enriched"
-    "text/rfc822-headers"
-    "text/x-latex" "application/x-latex"
-    "message/delivery-status"
-    "application/pgp" "text/x-pgp"
-    "application/octet-stream"
-    "application/x-selection" "application/x-comment")
-  "*List of media-types to be able to display in MIME-preview buffer.
-Each elements are string of TYPE/SUBTYPE, e.g. \"text/plain\".")
-
-(defun mime-view-body-visible-p (entity message-info)
-  "Return non-nil if body of ENTITY is visible."
-  (let ((media-type (mime-entity-media-type entity))
-       (media-subtype (mime-entity-media-subtype entity))
-       (ctype (mime-entity-type/subtype entity)))
-    (and (member ctype mime-view-visible-media-type-list)
-        (if (and (eq media-type 'application)
-                 (eq media-subtype 'octet-stream))
-            (member (mime-entity-encoding entity-info)
-                    '(nil "7bit" "8bit"))
-          t))))
-
-
-;;; @@ entity filter
+(defun mime-calist::field-match-method-as-default-rule (calist
+                                                       field-type field-value)
+  (let ((s-field (assq field-type calist)))
+    (cond ((null s-field)
+          (cons (cons field-type field-value) calist)
+          )
+         (t calist))))
+
+(define-calist-field-match-method
+  'header #'mime-calist::field-match-method-as-default-rule)
+
+(define-calist-field-match-method
+  'body #'mime-calist::field-match-method-as-default-rule)
+
+
+(defvar mime-preview-condition nil
+  "Condition-tree about how to display entity.")
+
+(ctree-set-calist-strictly
+ 'mime-preview-condition '((type . application)(subtype . octet-stream)
+                          (encoding . nil)
+                          (body . visible)))
+(ctree-set-calist-strictly
+ 'mime-preview-condition '((type . application)(subtype . octet-stream)
+                          (encoding . "7bit")
+                          (body . visible)))
+(ctree-set-calist-strictly
+ 'mime-preview-condition '((type . application)(subtype . octet-stream)
+                          (encoding . "8bit")
+                          (body . visible)))
+
+(ctree-set-calist-strictly
+ 'mime-preview-condition '((type . application)(subtype . pgp)
+                          (body . visible)))
+
+(ctree-set-calist-strictly
+ 'mime-preview-condition '((type . application)(subtype . x-latex)
+                          (body . visible)))
+
+(ctree-set-calist-strictly
+ 'mime-preview-condition '((type . application)(subtype . x-selection)
+                          (body . visible)))
+
+(ctree-set-calist-strictly
+ 'mime-preview-condition '((type . application)(subtype . x-comment)
+                          (body . visible)))
+
+(ctree-set-calist-strictly
+ 'mime-preview-condition '((type . message)(subtype . delivery-status)
+                          (body . visible)))
+
+(ctree-set-calist-strictly
+ 'mime-preview-condition
+ '((body . visible)
+   (body-presentation-method . mime-preview-text/plain)))
+
+(ctree-set-calist-strictly
+ 'mime-preview-condition
+ '((type . nil)
+   (body . visible)
+   (body-presentation-method . mime-preview-text/plain)))
+
+(ctree-set-calist-strictly
+ 'mime-preview-condition
+ '((type . text)(subtype . enriched)
+   (body . visible)
+   (body-presentation-method . mime-preview-text/enriched)))
+
+(ctree-set-calist-strictly
+ 'mime-preview-condition
+ '((type . text)(subtype . richtext)
+   (body . visible)
+   (body-presentation-method . mime-preview-text/richtext)))
+
+(ctree-set-calist-strictly
+ 'mime-preview-condition
+ '((type . text)(subtype . t)
+   (body . visible)
+   (body-presentation-method . mime-preview-text/plain)))
+
+(ctree-set-calist-strictly
+ 'mime-preview-condition
+ '((type . multipart)(subtype . alternative)
+   (body . visible)
+   (body-presentation-method . mime-preview-multipart/alternative)))
+
+(ctree-set-calist-strictly
+ 'mime-preview-condition '((type . message)(subtype . partial)
+                          (body-presentation-method
+                           . mime-preview-message/partial-button)))
+
+(ctree-set-calist-strictly
+ 'mime-preview-condition '((type . message)(subtype . rfc822)
+                          (body-presentation-method . nil)
+                          (childrens-situation (header . visible)
+                                               (entity-button . invisible))))
+
+(ctree-set-calist-strictly
+ 'mime-preview-condition '((type . message)(subtype . news)
+                          (body-presentation-method . nil)
+                          (childrens-situation (header . visible)
+                                               (entity-button . invisible))))
+
+
+;;; @@@ entity presentation

 ;;;
 
 ;;;
 

-(defvar mime-view-content-filter-alist
-  '(("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-preview 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.")
-
-(defun mime-view-display-body (beg end entity-node-id cinfo
-                                  ctype params subj encoding)
-  (save-restriction
-    (narrow-to-region (point-max)(point-max))
-    (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)
-          (funcall f ctype params encoding)
-          )
-      )))
+(autoload 'mime-preview-text/plain "mime-text")
+(autoload 'mime-preview-text/enriched "mime-text")
+(autoload 'mime-preview-text/richtext "mime-text")

 
 (defvar mime-view-announcement-for-message/partial
   (if (and (>= emacs-major-version 19) window-system)
 
 (defvar mime-view-announcement-for-message/partial
   (if (and (>= emacs-major-version 19) window-system)

@@ -325,7 +490,7 @@ function.  t means default media-type.")
 \[[ Please press `v' key in this buffer.         ]]"
     ))
 
 \[[ Please press `v' key in this buffer.         ]]"
     ))
 

-(defun mime-view-insert-message/partial-button ()
+(defun mime-preview-message/partial-button (&optional entity situation)

   (save-restriction
     (goto-char (point-max))
     (if (not (search-backward "\n\n" nil t))
   (save-restriction
     (goto-char (point-max))
     (if (not (search-backward "\n\n" nil t))

@@ -338,83 +503,226 @@ function.  t means default media-type.")
                     #'mime-preview-play-current-entity)
     ))
 
                     #'mime-preview-play-current-entity)
     ))
 

+(defun mime-preview-multipart/mixed (entity situation)
+  (let ((children (mime-entity-children entity))
+       (default-situation
+         (cdr (assq 'childrens-situation situation))))
+    (while children
+      (mime-view-display-entity (car children)
+                               (save-excursion
+                                 (set-buffer mime-raw-buffer)
+                                 mime-raw-message-info)
+                               mime-raw-buffer (current-buffer)
+                               default-situation)
+      (setq children (cdr children))
+      )))

 
 

-;;; @ entity separator
-;;;
-
-(defun mime-view-entity-separator-function (entity message-info)
-  "Insert entity-separator of ENTITY conditionally.
-Please redefine this function if you want to change default setting."
-  (or (mime-view-header-visible-p entity message-info)
-      (mime-view-body-visible-p entity message-info)
-      (progn
-       (goto-char (point-max))
-       (insert "\n")
-       )))
+(defcustom mime-view-type-subtype-score-alist
+  '(((text . enriched) . 3)
+    ((text . richtext) . 2)
+    ((text . plain)    . 1)
+    (t . 0))
+  "Alist MEDIA-TYPE vs corresponding score.
+MEDIA-TYPE must be (TYPE . SUBTYPE), TYPE or t.  t means default."
+  :group 'mime-view
+  :type '(repeat (cons (choice :tag "Media-Type"
+                              (item :tag "Type/Subtype"
+                                    (cons symbol symbol))
+                              (item :tag "Type" symbol)
+                              (item :tag "Default" t))
+                      integer)))
+
+(defun mime-preview-multipart/alternative (entity situation)
+  (let* ((children (mime-entity-children entity))
+        (default-situation
+          (cdr (assq 'childrens-situation situation)))
+        (i 0)
+        (p 0)
+        (max-score 0)
+        (situations
+         (mapcar (function
+                  (lambda (child)
+                    (let ((situation
+                           (or (ctree-match-calist
+                                mime-preview-condition
+                                (append
+                                 (or (mime-entity-content-type child)
+                                     (make-mime-content-type 'text 'plain))
+                                 (list* (cons 'encoding
+                                              (mime-entity-encoding child))
+                                        (cons 'major-mode major-mode)
+                                        default-situation)))
+                               default-situation)))
+                      (if (cdr (assq 'body-presentation-method situation))
+                          (let ((score
+                                 (cdr
+                                  (or (assoc
+                                       (cons
+                                        (cdr (assq 'type situation))
+                                        (cdr (assq 'subtype situation)))
+                                       mime-view-type-subtype-score-alist)
+                                      (assq
+                                       (cdr (assq 'type situation))
+                                       mime-view-type-subtype-score-alist)
+                                      (assq
+                                       t
+                                       mime-view-type-subtype-score-alist)
+                                      ))))
+                            (if (> score max-score)
+                                (setq p i
+                                      max-score score)
+                              )))
+                      (setq i (1+ i))
+                      situation)
+                    ))
+                 children)))
+    (setq i 0)
+    (while children
+      (let ((situation (car situations)))
+       (mime-view-display-entity (car children)
+                                 (save-excursion
+                                   (set-buffer mime-raw-buffer)
+                                   mime-raw-message-info)
+                                 mime-raw-buffer (current-buffer)
+                                 default-situation
+                                 (if (= i p)
+                                     situation
+                                   (del-alist 'body-presentation-method
+                                              (copy-alist situation))))
+       )
+      (setq children (cdr children)
+           situations (cdr situations)
+           i (1+ i))
+      )))

 
 
 ;;; @ acting-condition
 ;;;
 
 
 
 ;;; @ acting-condition
 ;;;
 

-(defvar mime-acting-condition
-  '(((type . text)(subtype . plain)
-     (method "tm-plain" nil 'file "" 'encoding 'mode 'name)
-     (mode "play" "print")
-     )
-    ((type . text)(subtype . html)
-     (method "tm-html" nil 'file "" 'encoding 'mode 'name)
-     (mode . "play")
-     )
-    ((type . text)(subtype . x-rot13-47)
-     (method . mime-method-to-display-caesar)
-     (mode . "play")
-     )
-    ((type . text)(subtype . x-rot13-47-48)
-     (method . mime-method-to-display-caesar)
-     (mode . "play")
-     )
-
-    ((type . audio)(subtype . basic)
-     (method "tm-au"    nil 'file "" 'encoding 'mode 'name)
-     (mode . "play")
-     )
-    
-    ((type . image)
-     (method "tm-image" nil 'file "" 'encoding 'mode 'name)
-     (mode "play" "print")
-     )
-    
-    ((type . video)(subtype . mpeg)
-     (method "tm-mpeg"  nil 'file "" 'encoding 'mode 'name)
-     (mode . "play")
-     )
-    
-    ((type . application)(subtype . postscript)
-     (method "tm-ps" nil 'file "" 'encoding 'mode 'name)
-     (mode "play" "print")
-     )
-    ((type . application)(subtype . octet-stream)
-     (method . mime-method-to-save)(mode "play" "print")
-     )
-
-    ((type . message)(subtype . external-body)
-     ("access-type" . "anon-ftp")
-     (method . mime-method-to-display-message/external-ftp)
-     )
-    ((type . message)(subtype . rfc822)
-     (method . mime-method-to-display-message/rfc822)
-     (mode . "play")
-     )
-    ((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")
-     )
-    ((method . mime-method-to-save)(mode . "extract"))
-    ))
+(defvar mime-acting-condition nil
+  "Condition-tree about how to process entity.")
+
+(if (file-readable-p mailcap-file)
+    (let ((entries (mailcap-parse-file)))
+      (while entries
+       (let ((entry (car entries))
+             view print shared)
+         (while entry
+           (let* ((field (car entry))
+                  (field-type (car field)))
+             (cond ((eq field-type 'view)  (setq view field))
+                   ((eq field-type 'print) (setq print field))
+                   ((memq field-type '(compose composetyped edit)))
+                   (t (setq shared (cons field shared))))
+             )
+           (setq entry (cdr entry))
+           )
+         (setq shared (nreverse shared))
+         (ctree-set-calist-with-default
+          'mime-acting-condition
+          (append shared (list '(mode . "play")(cons 'method (cdr view)))))
+         (if print
+             (ctree-set-calist-with-default
+              'mime-acting-condition
+              (append shared
+                      (list '(mode . "print")(cons 'method (cdr view))))
+              ))
+         )
+       (setq entries (cdr entries))
+       )))
+
+;; (ctree-set-calist-strictly
+;;  'mime-acting-condition
+;;  '((type . t)(subtype . t)(mode . "extract")
+;;    (method . mime-method-to-save)))
+(ctree-set-calist-with-default
+ 'mime-acting-condition
+ '((mode . "extract")
+   (method . mime-method-to-save)))
+
+;; (ctree-set-calist-strictly
+;;  'mime-acting-condition
+;;  '((type . text)(subtype . plain)(mode . "play")
+;;    (method "tm-plain" nil 'file "" 'encoding 'mode 'name)
+;;    ))
+;; (ctree-set-calist-strictly
+;;  'mime-acting-condition
+;;  '((type . text)(subtype . plain)(mode . "print")
+;;    (method "tm-plain" nil 'file "" 'encoding 'mode 'name)
+;;    ))
+;; (ctree-set-calist-strictly
+;;  'mime-acting-condition
+;;  '((type . text)(subtype . html)(mode . "play")
+;;    (method "tm-html" nil 'file "" 'encoding 'mode 'name)
+;;    ))
+(ctree-set-calist-strictly
+ 'mime-acting-condition
+ '((type . text)(subtype . x-rot13-47)(mode . "play")
+   (method . mime-method-to-display-caesar)
+   ))
+(ctree-set-calist-strictly
+ 'mime-acting-condition
+ '((type . text)(subtype . x-rot13-47-48)(mode . "play")
+   (method . mime-method-to-display-caesar)
+   ))
+
+;; (ctree-set-calist-strictly
+;;  'mime-acting-condition
+;;  '((type . audio)(subtype . basic)(mode . "play")
+;;    (method "tm-au" nil 'file "" 'encoding 'mode 'name)
+;;    ))
+
+;; (ctree-set-calist-strictly
+;;  'mime-acting-condition
+;;  '((type . image)(mode . "play")
+;;    (method "tm-image" nil 'file "" 'encoding 'mode 'name)
+;;    ))
+;; (ctree-set-calist-strictly
+;;  'mime-acting-condition
+;;  '((type . image)(mode . "print")
+;;    (method "tm-image" nil 'file "" 'encoding 'mode 'name)
+;;    ))
+
+;; (ctree-set-calist-strictly
+;;  'mime-acting-condition
+;;  '((type . video)(subtype . mpeg)(mode . "play")
+;;    (method "tm-mpeg" nil 'file "" 'encoding 'mode 'name)
+;;    ))
+
+;; (ctree-set-calist-strictly
+;;  'mime-acting-condition
+;;  '((type . application)(subtype . postscript)(mode . "play")
+;;    (method "tm-ps" nil 'file "" 'encoding 'mode 'name)
+;;    ))
+;; (ctree-set-calist-strictly
+;;  'mime-acting-condition
+;;  '((type . application)(subtype . postscript)(mode . "print")
+;;    (method "tm-ps" nil 'file "" 'encoding 'mode 'name)
+;;    ))
+
+(ctree-set-calist-strictly
+ 'mime-acting-condition
+ '((type . message)(subtype . rfc822)(mode . "play")
+   (method . mime-method-to-display-message/rfc822)
+   ))
+(ctree-set-calist-strictly
+ 'mime-acting-condition
+ '((type . message)(subtype . partial)(mode . "play")
+   (method . mime-method-to-store-message/partial)
+   ))
+
+(ctree-set-calist-strictly
+ 'mime-acting-condition
+ '((type . message)(subtype . external-body)
+   ("access-type" . "anon-ftp")
+   (method . mime-method-to-display-message/external-ftp)
+   ))
+
+(ctree-set-calist-strictly
+ 'mime-acting-condition
+ '((type . application)(subtype . octet-stream)
+   (method . mime-method-to-save)
+   ))

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

@@ -480,7 +788,6 @@ The compressed face will be piped to this command.")
 (defvar mime-view-uuencode-encoding-name-list '("x-uue" "x-uuencode"))
 
 
 (defvar mime-view-uuencode-encoding-name-list '("x-uue" "x-uuencode"))
 
 

-

 ;;; @ buffer setup
 ;;;
 
 ;;; @ buffer setup
 ;;;
 

@@ -495,11 +802,9 @@ The compressed face will be piped to this command.")
   (or mime-view-redisplay
       (setq mime-raw-message-info (mime-parse-message ctl encoding))
       )
   (or mime-view-redisplay
       (setq mime-raw-message-info (mime-parse-message ctl encoding))
       )

-  (let* ((cinfo mime-raw-message-info)
-        (pcl (mime-raw-flatten-message-info cinfo))
-        (the-buf (current-buffer))
-        (mode major-mode)
-        )
+  (let ((message-info mime-raw-message-info)
+       (the-buf (current-buffer))
+       (mode major-mode))

     (or obuf
        (setq obuf (concat "*Preview-" (buffer-name the-buf) "*")))
     (set-buffer (get-buffer-create obuf))
     (or obuf
        (setq obuf (concat "*Preview-" (buffer-name the-buf) "*")))
     (set-buffer (get-buffer-create obuf))

@@ -511,10 +816,11 @@ The compressed face will be piped to this command.")
       (setq mime-preview-original-major-mode mode)
       (setq major-mode 'mime-view-mode)
       (setq mode-name "MIME-View")
       (setq mime-preview-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))
-       )
+      (mime-view-display-entity message-info message-info
+                               the-buf obuf
+                               '((entity-button . invisible)
+                                 (header . visible)
+                                 ))

       (set-buffer-modified-p nil)
       )
     (setq buffer-read-only t)
       (set-buffer-modified-p nil)
       )
     (setq buffer-read-only t)

@@ -523,172 +829,127 @@ The compressed face will be piped to this command.")
   (setq mime-preview-buffer obuf)
   )
 
   (setq mime-preview-buffer obuf)
   )
 

-(defun mime-view-display-entity (entity message-info ibuf obuf)
-  "Display ENTITY."
-  (let* ((beg (mime-entity-point-min entity))
+(defun mime-view-display-entity (entity message-info ibuf obuf
+                                       default-situation
+                                       &optional situation)
+  (let* ((start (mime-entity-point-min entity))

         (end (mime-entity-point-max entity))
         (end (mime-entity-point-max entity))

-        (media-type (mime-entity-media-type entity))
-        (media-subtype (mime-entity-media-subtype entity))
-        (ctype (if media-type
-                   (if media-subtype
-                       (format "%s/%s" media-type media-subtype)
-                     (symbol-name media-type)
-                     )))
-        (params (mime-entity-parameters entity))
-        (encoding (mime-entity-encoding entity))
-        (entity-node-id (mime-entity-node-id entity))
-        he e nb ne subj)
+         (content-type (mime-entity-content-type entity))
+         (encoding (mime-entity-encoding entity))
+        end-of-header e nb ne subj)

     (set-buffer ibuf)
     (set-buffer ibuf)

-    (goto-char beg)
-    (setq he (if (re-search-forward "^$" nil t)
-                (1+ (match-end 0))
-              end))
-    (if (> he end)
-       (setq he end)
+    (goto-char start)
+    (setq end-of-header (if (re-search-forward "^$" nil t)
+                           (1+ (match-end 0))
+                         end))
+    (if (> end-of-header end)
+       (setq end-of-header end)

       )
     (save-restriction
       )
     (save-restriction

-      (narrow-to-region beg end)
-      (setq subj
-           (eword-decode-string
-            (mime-raw-get-subject params encoding)))
-      )
-    (set-buffer obuf)
-    (setq nb (point))
-    (narrow-to-region nb nb)
-    (mime-view-entity-button-function entity message-info subj)
-    (if (mime-view-header-visible-p entity message-info)
-       (mime-view-display-header beg he)
+      (narrow-to-region start end)
+      (setq subj (eword-decode-string (mime-raw-get-subject entity)))

       )
       )

-    (if (and (null entity-node-id)
-            (member
-             ctype mime-view-content-button-visible-ctype-list))
-       (save-excursion
-         (goto-char (point-max))
-         (mime-view-insert-entity-button entity message-info subj)
-         ))
-    (cond ((mime-view-body-visible-p entity message-info)
-          (mime-view-display-body he end
-                                  entity-node-id message-info
-                                  ctype params subj encoding)
-          )
-         ((and (eq media-type 'message)(eq media-subtype 'partial))
-          (mime-view-insert-message/partial-button)
-          )
-         ((and (null entity-node-id)
-               (null (mime-entity-children message-info))
-               )
-          (goto-char (point-max))
-          (mime-view-insert-entity-button entity message-info subj)
-          ))
-    (mime-view-entity-separator-function entity message-info)
-    (setq ne (point-max))
-    (widen)
-    (put-text-property nb ne 'mime-view-raw-buffer ibuf)
-    (put-text-property nb ne 'mime-view-entity-info entity)
-    (goto-char ne)
-    ))
+    (or situation
+       (setq situation
+             (or (ctree-match-calist mime-preview-condition
+                                     (append
+                                      (or content-type
+                                          (make-mime-content-type
+                                           'text 'plain))
+                                      (list* (cons 'encoding   encoding)
+                                             (cons 'major-mode major-mode)
+                                             default-situation)))
+                 default-situation)))
+    (let ((button-is-invisible
+          (eq (cdr (assq 'entity-button situation)) 'invisible))
+         (header-is-visible
+          (eq (cdr (assq 'header situation)) 'visible))
+         (body-presentation-method
+          (cdr (assq 'body-presentation-method situation)))
+         (children (mime-entity-children entity)))
+      (set-buffer obuf)
+      (setq nb (point))
+      (narrow-to-region nb nb)
+      (or button-is-invisible
+         (if (mime-view-entity-button-visible-p entity)
+             (mime-view-insert-entity-button entity subj)
+           ))
+      (if header-is-visible
+         (save-restriction
+           (narrow-to-region (point)(point))
+           (insert-buffer-substring mime-raw-buffer start end-of-header)
+           (let ((f (cdr (assq mime-preview-original-major-mode
+                               mime-view-content-header-filter-alist))))
+             (if (functionp f)
+                 (funcall f)
+               (mime-view-default-content-header-filter)
+               ))
+           (run-hooks 'mime-view-content-header-filter-hook)
+           ))
+      (cond ((eq body-presentation-method 'with-filter)
+            (let ((body-filter (cdr (assq 'body-filter situation))))
+              (save-restriction
+                (narrow-to-region (point-max)(point-max))
+                (insert-buffer-substring mime-raw-buffer end-of-header end)
+                (funcall body-filter situation)
+                )))
+           (children)
+           ((functionp body-presentation-method)
+            (funcall body-presentation-method entity situation)
+            )
+           (t
+            (when button-is-invisible
+              (goto-char (point-max))
+              (mime-view-insert-entity-button entity subj)
+              )
+            (or header-is-visible
+                (progn
+                  (goto-char (point-max))
+                  (insert "\n")
+                  ))
+            ))
+      (setq ne (point-max))
+      (widen)
+      (put-text-property nb ne 'mime-view-raw-buffer ibuf)
+      (put-text-property nb ne 'mime-view-entity entity)
+      (goto-char ne)
+      (if children
+         (if (functionp body-presentation-method)
+             (funcall body-presentation-method entity situation)
+           (mime-preview-multipart/mixed entity situation)
+           ))
+      )))

 
 

-(defun mime-raw-get-uu-filename (param &optional encoding)
-  (if (member (or encoding
-                 (cdr (assq 'encoding param))
-                 )
-             mime-view-uuencode-encoding-name-list)
-      (save-excursion
-       (or (if (re-search-forward "^begin [0-9]+ " nil t)
-               (if (looking-at ".+$")
-                   (buffer-substring (match-beginning 0)(match-end 0))
-                 ))
-           ""))
-    ))
+(defun mime-raw-get-uu-filename ()
+  (save-excursion
+    (if (re-search-forward "^begin [0-9]+ " nil t)
+       (if (looking-at ".+$")
+           (buffer-substring (match-beginning 0)(match-end 0))
+         ))))

 
 

-(defun mime-raw-get-subject (param &optional encoding)
+(defun mime-raw-get-subject (entity)

   (or (std11-find-field-body '("Content-Description" "Subject"))
   (or (std11-find-field-body '("Content-Description" "Subject"))

-      (let (ret)
-       (if (or (and (setq ret (mime/Content-Disposition))
-                    (setq ret (assoc "filename" (cdr ret)))
-                    )
-               (setq ret (assoc "name" param))
-               (setq ret (assoc "x-name" param))
-               )
-           (std11-strip-quoted-string (cdr ret))
-         ))
-      (mime-raw-get-uu-filename param encoding)
+      (let ((ret (mime-entity-content-disposition entity)))
+       (and ret
+            (setq ret (mime-content-disposition-filename ret))
+            (std11-strip-quoted-string ret)
+            ))
+      (let ((ret (mime-entity-content-type entity)))
+       (and ret
+            (setq ret
+                  (cdr
+                   (let ((param (mime-content-type-parameters ret)))
+                     (or (assoc "name" param)
+                         (assoc "x-name" param))
+                     )))
+            (std11-strip-quoted-string ret)
+            ))
+      (if (member (mime-entity-encoding entity)
+                 mime-view-uuencode-encoding-name-list)
+         (mime-raw-get-uu-filename))

       ""))
 
 
       ""))
 
 

-;;; @ entity information
-;;;
-
-(defun mime-raw-point-to-entity-number (position &optional message-info)
-  "Return entity-number from POTION in mime-raw-buffer.
-If optional argument MESSAGE-INFO is not specified,
-`mime-raw-message-info' is used."
-  (or message-info
-      (setq message-info mime-raw-message-info))
-  (let ((b (mime-entity-point-min message-info))
-       (e (mime-entity-point-max message-info))
-       (c (mime-entity-children message-info))
-       )
-    (if (and (<= b position)(<= position e))
-       (or (let (co ret (sn 0))
-             (catch 'tag
-               (while c
-                 (setq co (car c))
-                 (setq ret (mime-raw-point-to-entity-number position co))
-                 (cond ((eq ret t) (throw 'tag (list sn)))
-                       (ret (throw 'tag (cons sn ret)))
-                       )
-                 (setq c (cdr c))
-                 (setq sn (1+ sn))
-                 )))
-           t))))
-
-(defun mime-raw-point-to-entity-node-id (position &optional message-info)
-  "Return entity-node-id from POTION in mime-raw-buffer.
-If optional argument MESSAGE-INFO is not specified,
-`mime-raw-message-info' is used."
-  (reverse (mime-raw-point-to-entity-number position message-info)))
-
-(defsubst mime-raw-find-entity-from-node-id (entity-node-id
-                                            &optional message-info)
-  "Return entity-info from ENTITY-NODE-ID in mime-raw-buffer.
-If optional argument MESSAGE-INFO is not specified,
-`mime-raw-message-info' is used."
-  (mime-raw-entity-number-to-entity-info (reverse entity-node-id)
-                                        message-info))
-
-(defun mime-raw-entity-number-to-entity-info (entity-number
-                                             &optional message-info)
-  "Return entity-info from ENTITY-NUMBER in mime-raw-buffer.
-If optional argument MESSAGE-INFO is not specified,
-`mime-raw-message-info' is used."
-  (or message-info
-      (setq message-info mime-raw-message-info))
-  (if (eq entity-number t)
-      message-info
-    (let ((sn (car entity-number)))
-      (if (null sn)
-         message-info
-       (let ((rc (nth sn (mime-entity-children message-info))))
-         (if rc
-             (mime-raw-entity-number-to-entity-info (cdr entity-number) rc)
-           ))
-       ))))
-
-(defun mime-raw-flatten-message-info (&optional message-info)
-  "Return list of entity-infos in mime-raw-buffer.
-If optional argument MESSAGE-INFO is not specified,
-`mime-raw-message-info' is used."
-  (or message-info
-      (setq message-info mime-raw-message-info))
-  (let ((dest (list message-info))
-       (rcl (mime-entity-children message-info)))
-    (while rcl
-      (setq dest (nconc dest (mime-raw-flatten-message-info (car rcl))))
-      (setq rcl (cdr rcl)))
-    dest))
-
-

 ;;; @ MIME viewer mode
 ;;;
 
 ;;; @ MIME viewer mode
 ;;;
 

@@ -863,7 +1124,8 @@ button-2   Move to point under the mouse cursor
            (setq mime-mother-buffer mother)
            ))
       (mime-view-define-keymap default-keymap-or-function)
            (setq mime-mother-buffer mother)
            ))
       (mime-view-define-keymap default-keymap-or-function)

-      (let ((point (next-single-property-change (point-min) 'mime-view-entity-info)))
+      (let ((point
+            (next-single-property-change (point-min) 'mime-view-entity)))

        (if point
            (goto-char point)
          (goto-char (point-min))
        (if point
            (goto-char point)
          (goto-char (point-min))

@@ -917,14 +1179,13 @@ of the mother-buffer."
 It calls following-method selected from variable
 `mime-view-following-method-alist'."
   (interactive)
 It calls following-method selected from variable
 `mime-view-following-method-alist'."
   (interactive)

-  (let ((message-info (get-text-property (point-min) 'mime-view-entity-info))
-       entity)
+  (let (entity)

     (while (null (setq entity
     (while (null (setq entity

-                      (get-text-property (point) 'mime-view-entity-info)))
+                      (get-text-property (point) 'mime-view-entity)))

       (backward-char)
       )
     (let* ((p-beg
       (backward-char)
       )
     (let* ((p-beg

-           (previous-single-property-change (point) 'mime-view-entity-info))
+           (previous-single-property-change (point) 'mime-view-entity))

           p-end
           (entity-node-id (mime-entity-node-id entity))
           (len (length entity-node-id))
           p-end
           (entity-node-id (mime-entity-node-id entity))
           (len (length entity-node-id))

@@ -932,16 +1193,16 @@ It calls following-method selected from variable
       (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)

-                                                       'mime-view-entity-info)
+                                                       'mime-view-entity)

                           (point))
                       (point)
                     (point-min)))
             )
                           (point))
                       (point)
                     (point-min)))
             )

-           ((eq (next-single-property-change p-beg 'mime-view-entity-info)
+           ((eq (next-single-property-change p-beg 'mime-view-entity)

                 (point))
             (setq p-beg (point))
             ))
                 (point))
             (setq p-beg (point))
             ))

-      (setq p-end (next-single-property-change p-beg 'mime-view-entity-info))
+      (setq p-end (next-single-property-change p-beg 'mime-view-entity))

       (cond ((null p-end)
             (setq p-end (point-max))
             )
       (cond ((null p-end)
             (setq p-end (point-max))
             )

@@ -955,11 +1216,11 @@ It calls following-method selected from variable
                 (let (e)
                   (while (setq e
                                (next-single-property-change
                 (let (e)
                   (while (setq e
                                (next-single-property-change

-                                (point) 'mime-view-entity-info))
+                                (point) 'mime-view-entity))

                     (goto-char e)
                     (let ((rc (mime-entity-node-id
                                (get-text-property (point)
                     (goto-char e)
                     (let ((rc (mime-entity-node-id
                                (get-text-property (point)

-                                                  'mime-view-entity-info))))
+                                                  'mime-view-entity))))

                       (or (equal entity-node-id
                                  (nthcdr (- (length rc) len) rc))
                           (throw 'tag nil)
                       (or (equal entity-node-id
                                  (nthcdr (- (length rc) len) rc))
                           (throw 'tag nil)

@@ -981,16 +1242,7 @@ It calls following-method selected from variable
          (erase-buffer)
          (insert-buffer-substring the-buf p-beg p-end)
          (goto-char (point-min))
          (erase-buffer)
          (insert-buffer-substring the-buf p-beg p-end)
          (goto-char (point-min))

-         (if (mime-view-header-visible-p entity message-info)
-             (delete-region (goto-char (point-min))
-                            (if (re-search-forward "^$" nil t)
-                                (match-end 0)
-                              (point-min)))
-           )
-         (goto-char (point-min))
-         (insert "\n")
-         (goto-char (point-min))
-         (let ((entity-node-id (mime-entity-node-id entity)) ci str)
+          (let ((entity-node-id (mime-entity-node-id entity)) ci str)

            (while (progn
                     (setq
                      str
            (while (progn
                     (setq
                      str

@@ -1071,18 +1323,18 @@ If there is no upper entity, call function `mime-preview-quit'."
   (interactive)
   (let (cinfo)
     (while (null (setq cinfo
   (interactive)
   (let (cinfo)
     (while (null (setq cinfo

-                      (get-text-property (point) 'mime-view-entity-info)))
+                      (get-text-property (point) 'mime-view-entity)))

       (backward-char)
       )
     (let ((r (mime-raw-find-entity-from-node-id
              (cdr (mime-entity-node-id cinfo))
       (backward-char)
       )
     (let ((r (mime-raw-find-entity-from-node-id
              (cdr (mime-entity-node-id cinfo))

-             (get-text-property 1 'mime-view-entity-info)))
+             (get-text-property 1 'mime-view-entity)))

          point)
       (catch 'tag
        (while (setq point (previous-single-property-change
          point)
       (catch 'tag
        (while (setq point (previous-single-property-change

-                           (point) 'mime-view-entity-info))
+                           (point) 'mime-view-entity))

          (goto-char point)
          (goto-char point)

-         (if (eq r (get-text-property (point) 'mime-view-entity-info))
+         (if (eq r (get-text-property (point) 'mime-view-entity))

              (throw 'tag t)
            )
          )
              (throw 'tag t)
            )
          )

@@ -1094,13 +1346,16 @@ If there is no upper entity, call function `mime-preview-quit'."
 If there is no previous entity, it calls function registered in
 variable `mime-view-over-to-previous-method-alist'."
   (interactive)
 If there is no previous entity, it calls function registered in
 variable `mime-view-over-to-previous-method-alist'."
   (interactive)

-  (while (null (get-text-property (point) 'mime-view-entity-info))
+  (while (null (get-text-property (point) 'mime-view-entity))

     (backward-char)
     )
     (backward-char)
     )

-  (let ((point
-        (previous-single-property-change (point) 'mime-view-entity-info)))
+  (let ((point (previous-single-property-change (point) 'mime-view-entity)))

     (if point
     (if point

-       (goto-char point)
+       (if (get-text-property (1- point) 'mime-view-entity)
+           (goto-char point)
+         (goto-char (1- point))
+         (mime-preview-move-to-previous)
+         )

       (let ((f (assq mime-preview-original-major-mode
                     mime-view-over-to-previous-method-alist)))
        (if f
       (let ((f (assq mime-preview-original-major-mode
                     mime-view-over-to-previous-method-alist)))
        (if f

@@ -1113,9 +1368,16 @@ variable `mime-view-over-to-previous-method-alist'."
 If there is no previous entity, it calls function registered in
 variable `mime-view-over-to-next-method-alist'."
   (interactive)
 If there is no previous entity, it calls function registered in
 variable `mime-view-over-to-next-method-alist'."
   (interactive)

-  (let ((point (next-single-property-change (point) 'mime-view-entity-info)))
+  (while (null (get-text-property (point) 'mime-view-entity))
+    (forward-char)
+    )
+  (let ((point (next-single-property-change (point) 'mime-view-entity)))

     (if point
     (if point

-       (goto-char point)
+       (progn
+         (goto-char point)
+         (if (null (get-text-property point 'mime-view-entity))
+             (mime-preview-move-to-next)
+           ))

       (let ((f (assq mime-preview-original-major-mode
                     mime-view-over-to-next-method-alist)))
        (if f
       (let ((f (assq mime-preview-original-major-mode
                     mime-view-over-to-next-method-alist)))
        (if f

@@ -1138,7 +1400,7 @@ If reached to (point-max), it calls function registered in variable
             (funcall (cdr f))
           ))
     (let ((point
             (funcall (cdr f))
           ))
     (let ((point

-          (or (next-single-property-change (point) 'mime-view-entity-info)
+          (or (next-single-property-change (point) 'mime-view-entity)

               (point-max))))
       (forward-line h)
       (if (> (point) point)
               (point-max))))
       (forward-line h)
       (if (> (point) point)

@@ -1163,10 +1425,10 @@ If reached to (point-min), it calls function registered in variable
     (let (point)
       (save-excursion
        (catch 'tag
     (let (point)
       (save-excursion
        (catch 'tag

-         (while (> (point) 1)
+         (while (not (bobp))

            (if (setq point
                      (previous-single-property-change (point)
            (if (setq point
                      (previous-single-property-change (point)

-                                                      'mime-view-entity-info))
+                                                      'mime-view-entity))

                (throw 'tag t)
              )
            (backward-char)
                (throw 'tag t)
              )
            (backward-char)