(mime-acting-condition): Use `mime-method-to-save' instead of external
[elisp/semi.git] / mime-view.el
index 16ddb01..f365499 100644 (file)
@@ -1,15 +1,14 @@
 ;;; mime-view.el --- interactive MIME viewer for GNU Emacs
 
-;; Copyright (C) 1995,1996,1997 Free Software Foundation, Inc.
+;; Copyright (C) 1995,1996,1997,1998 Free Software Foundation, Inc.
 
 ;; Author: MORIOKA Tomohiko <morioka@jaist.ac.jp>
 ;; Created: 1994/7/13
 ;;     Renamed: 1994/8/31 from tm-body.el
 ;;     Renamed: 1997/02/19 from tm-view.el
-;; Version: $Revision: 0.49 $
 ;; Keywords: MIME, multimedia, mail, news
 
-;; This file is part of SEMI (SEMI is Emacs MIME Interfaces).
+;; This file is part of SEMI (Sophisticated Emacs MIME Interfaces).
 
 ;; This program is free software; you can redistribute it and/or
 ;; modify it under the terms of the GNU General Public License as
@@ -28,7 +27,6 @@
 
 ;;; Code:
 
-(require 'cl)
 (require 'std11)
 (require 'mel)
 (require 'eword-decode)
 ;;; @ version
 ;;;
 
-(defconst mime-view-RCS-ID
-  "$Id: mime-view.el,v 0.49 1997-03-17 14:41:19 morioka Exp $")
-
-(defconst mime-view-version (get-version-string mime-view-RCS-ID))
+(defconst mime-view-version-string
+  `,(concat "SEMI MIME-View "
+           (mapconcat #'number-to-string (cdr semi-version) ".")
+           " (" (car semi-version) ")"))
 
 
 ;;; @ variables
 ;;;
 
-(defvar mime/content-decoding-condition
+(defvar mime-acting-condition
   '(((type . "text/plain")
      (method "tm-plain" nil 'file 'type 'encoding 'mode 'name)
      (mode "play" "print")
      (mode . "play")
      )
     ((type . "text/x-rot13-47")
-     (method . mime-article/decode-caesar)
+     (method . mime-method-to-display-caesar)
+     (mode . "play")
+     )
+    ((type . "text/x-rot13-47-48")
+     (method . mime-method-to-display-caesar)
      (mode . "play")
      )
     ((type . "audio/basic")
      (method "tm-image" nil 'file 'type 'encoding 'mode 'name)
      (mode "play" "print")
      )
+    ((type . "image/png")
+     (method "tm-image" nil 'file 'type 'encoding 'mode 'name)
+     (mode "play" "print")
+     )
     ((type . "image/tiff")
      (method "tm-image" nil 'file 'type 'encoding 'mode 'name)
      (mode "play" "print")
      (mode "play" "print")
      )
     ((type . "application/octet-stream")
-     (method "tm-file"  nil 'file 'type 'encoding 'mode 'name)
-     (mode "play" "print")
+     (method . mime-method-to-save)(mode "play" "print")
+     )
+
+    ((type . "message/external-body")
+     ("access-type" . "anon-ftp")
+     (method . mime-method-to-display-message/external-ftp)
      )
-    
-    ;;((type . "message/external-body")
-    ;; (method "xterm" nil
-    ;;        "-e" "showexternal"
-    ;;         'file '"access-type" '"name" '"site" '"directory"))
     ((type . "message/rfc822")
-     (method . mime-article/view-message/rfc822)
+     (method . mime-method-to-display-message/rfc822)
      (mode . "play")
      )
     ((type . "message/partial")
-     (method . mime-article/decode-message/partial)
+     (method . mime-method-to-store-message/partial)
      (mode . "play")
      )
-    ((type . "message/external-body")
-     ("access-type" . "anon-ftp")
-     (method . mime-article/decode-message/external-ftp)
-     )
     
     ((method "metamail" t "-m" "tm" "-x" "-d" "-z" "-e" 'file)
      (mode . "play")
      )
-    ((method "tm-file"  nil 'file 'type 'encoding 'mode 'name)
-     (mode . "extract")
-     )
+    ((method . mime-method-to-save)(mode . "extract"))
     ))
 
 (defvar mime-view-childrens-header-showing-Content-Type-list
@@ -185,121 +184,101 @@ Each elements are regexp of field-name.")
     ))
 
 
-;;; @@ predicate functions
-;;;
-
-(defun mime-view-header-visible-p (rcnum cinfo)
-  "Return non-nil if header of current entity is visible."
-  (or (null rcnum)
-      (member (mime::content-info/type
-              (mime-article/rcnum-to-cinfo (cdr rcnum) cinfo))
-             mime-view-childrens-header-showing-Content-Type-list)
-      ))
-
-(defun mime-view-body-visible-p (rcnum cinfo &optional ctype)
-  (let (ccinfo)
-    (or ctype
-       (setq ctype
-             (mime::content-info/type
-              (setq ccinfo (mime-article/rcnum-to-cinfo rcnum cinfo))
-              ))
-       )
-    (and (member ctype mime-view-visible-media-type-list)
-        (if (string-equal ctype "application/octet-stream")
-            (progn
-              (or ccinfo
-                  (setq ccinfo (mime-article/rcnum-to-cinfo rcnum cinfo))
-                  )
-              (member (mime::content-info/encoding ccinfo)
-                      '(nil "7bit" "8bit"))
-              )
-          t))
-    ))
-
-
 ;;; @@ entity button
 ;;;
 
-(defun mime-view-insert-entity-button (rcnum cinfo ctype params subj encoding)
+(defun mime-view-insert-entity-button (rcnum cinfo
+                                            media-type media-subtype params
+                                            subj encoding)
   "Insert entity-button."
-  (save-restriction
-    (narrow-to-region (point)(point))
-    (let ((access-type (assoc "access-type" params))
-         (num (or (cdr (assoc "x-part-number" params))
-                  (if (consp rcnum)
-                      (mapconcat (function
-                                  (lambda (num)
-                                    (format "%s" (1+ num))
-                                    ))
-                                 (reverse rcnum) ".")
-                    "0"))
-              ))
-      (cond (access-type
-            (let ((server (assoc "server" params)))
-              (setq access-type (cdr access-type))
-              (if server
-                  (insert (format "[%s %s ([%s] %s)]\n" num subj
-                                  access-type (cdr server)))
-                (let ((site (cdr (assoc "site" params)))
-                      (dir (cdr (assoc "directory" params)))
-                      )
-                  (insert (format "[%s %s ([%s] %s:%s)]\n" num subj
-                                  access-type site dir))
-                  )))
-            )
-           (t
-            (let ((charset (cdr (assoc "charset" params))))
-              (insert (concat "[" num " " subj))
+  (mime-insert-button
+   (let ((access-type (assoc "access-type" params))
+        (num (or (cdr (assoc "x-part-number" params))
+                 (if (consp rcnum)
+                     (mapconcat (function
+                                 (lambda (num)
+                                   (format "%s" (1+ num))
+                                   ))
+                                (reverse rcnum) ".")
+                   "0"))
+             ))
+     (cond (access-type
+           (let ((server (assoc "server" params)))
+             (setq access-type (cdr access-type))
+             (if server
+                 (format "%s %s ([%s] %s)"
+                         num subj access-type (cdr server))
+               (let ((site (cdr (assoc "site" params)))
+                     (dir (cdr (assoc "directory" params)))
+                     )
+                 (format "%s %s ([%s] %s:%s)"
+                         num subj access-type site dir)
+                 )))
+           )
+          (t
+           (let ((charset (cdr (assoc "charset" params))))
+             (concat
+              num " " subj
               (let ((rest
-                     (concat " <" ctype
+                     (format " <%s/%s%s%s>"
+                             media-type media-subtype
                              (if charset
                                  (concat "; " charset)
-                               (if encoding (concat " (" encoding ")"))
-                               )
-                             ">]\n")))
+                               "")
+                             (if encoding
+                                 (concat " (" encoding ")")
+                               ""))))
                 (if (>= (+ (current-column)(length rest))(window-width))
-                    (insert "\n\t")
-                  )
-                (insert rest)
-                ))))
-      )
-    (mime-add-button (point-min)(1- (point-max))
-                    (function mime-view-play-current-entity))
-    ))
+                    "\n\t")
+                rest)))
+           )))
+   (function mime-view-play-current-entity))
+  )
 
-(defun mime-view-entity-button-function
-  (rcnum cinfo ctype params subj encoding)
+(defun mime-view-entity-button-function (rcnum cinfo
+                                              media-type media-subtype
+                                              params subj encoding)
   "Insert entity button conditionally.
 Please redefine this function if you want to change default setting."
   (or (null rcnum)
-      (string= ctype "application/x-selection")
-      (and (string= ctype "application/octet-stream")
-          (string= (mime::content-info/type
-                    (mime-article/rcnum-to-cinfo (cdr rcnum) cinfo))
-                   "multipart/encrypted"))
-      (mime-view-insert-entity-button rcnum cinfo ctype params subj encoding)
+      (and (eq media-type 'application)
+          (or (eq media-subtype 'x-selection)
+              (and (eq media-subtype 'octet-stream)
+                   (let ((entity-info
+                          (mime-article/rcnum-to-cinfo (cdr rcnum) cinfo)))
+                     (and (eq (mime-entity-info-media-type entity-info)
+                              'multipart)
+                          (eq (mime-entity-info-media-subtype entity-info)
+                              'encrypted)
+                          )))))
+      (mime-view-insert-entity-button
+       rcnum cinfo media-type media-subtype params subj encoding)
       ))
 
 
 ;;; @@ content header filter
 ;;;
 
-(defsubst mime-view-cut-header ()
+(defun mime-view-cut-header ()
   (goto-char (point-min))
   (while (re-search-forward mime-view-ignored-field-regexp nil t)
     (let* ((beg (match-beginning 0))
           (end (match-end 0))
           (name (buffer-substring beg end))
           )
-      (or (member-if (function
-                     (lambda (regexp)
-                       (string-match regexp name)
-                       )) mime-view-visible-field-list)
-         (delete-region beg
+      (catch 'visible
+       (let ((rest mime-view-visible-field-list))
+         (while rest
+           (if (string-match (car rest) name)
+               (throw 'visible nil)
+             )
+           (setq rest (cdr rest))))
+       (delete-region beg
+                      (save-excursion
                         (if (re-search-forward "^\\([^ \t]\\|$\\)" nil t)
                             (match-beginning 0)
-                          (point-max)))
-         ))))
+                          (point-max))))
+       ))))
 
 (defun mime-view-default-content-header-filter ()
   (mime-view-cut-header)
@@ -313,20 +292,26 @@ Please redefine this function if you want to change default setting."
 ;;;
 
 (defvar mime-view-content-filter-alist
-  '(("text/enriched" . mime-preview/filter-for-text/enriched)
-    ("text/richtext" . mime-preview/filter-for-text/richtext)
-    (t . mime-preview/filter-for-text/plain)
-    ))
+  '(("text/enriched" . mime-view-filter-for-text/enriched)
+    ("text/richtext" . mime-view-filter-for-text/richtext)
+    (t . mime-view-filter-for-text/plain)
+    )
+  "Alist of media-types vs. corresponding MIME-View filter functions.
+Each element looks like (TYPE/SUBTYPE . FUNCTION) or (t . FUNCTION).
+TYPE/SUBTYPE is a string of media-type and FUNCTION is a filter
+function.  t means default media-type.")
 
 
 ;;; @@ entity separator
 ;;;
 
-(defun mime-view-entity-separator-function (rcnum cinfo ctype params subj)
+(defun mime-view-entity-separator-function (rcnum cinfo
+                                                 media-type media-subtype
+                                                 params subj)
   "Insert entity separator conditionally.
 Please redefine this function if you want to change default setting."
   (or (mime-view-header-visible-p rcnum cinfo)
-      (mime-view-body-visible-p rcnum cinfo ctype)
+      (mime-view-body-visible-p rcnum cinfo media-type media-subtype)
       (progn
        (goto-char (point-max))
        (insert "\n")
@@ -339,22 +324,48 @@ Please redefine this function if you want to change default setting."
 ;;; @@@ in raw buffer
 ;;;
 
-(make-variable-buffer-local 'mime::article/content-info)
+(defvar mime-raw-content-info
+  "Information about structure of message.
+Please use reference function `mime::content-info/SLOT-NAME' to
+reference slot of content-info.  Their argument is only content-info.
+
+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/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)
 
-(defvar mime::article/preview-buffer nil)
-(make-variable-buffer-local 'mime::article/preview-buffer)
+If a entity includes other entities in its body, such as multipart or
+message/rfc822, content-infos of other entities are included in
+`children', so content-info become a tree.")
+(make-variable-buffer-local 'mime-raw-content-info)
+
+(defvar mime-view-buffer nil
+  "MIME View buffer corresponding with the (raw) buffer.")
+(make-variable-buffer-local 'mime-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-raw-buffer nil
+  "Raw buffer corresponding with the (MIME-View) buffer.")
+(make-variable-buffer-local 'mime-raw-buffer)
 
-(defvar mime::preview/article-buffer nil)
-(make-variable-buffer-local 'mime::preview/article-buffer)
+(defvar mime-view-original-major-mode nil
+  "Major-mode in mime-raw-buffer.")
+(make-variable-buffer-local 'mime-view-original-major-mode)
 
-(make-variable-buffer-local 'mime::preview/original-major-mode)
 (make-variable-buffer-local 'mime::preview/original-window-configuration)
 
 
@@ -362,19 +373,22 @@ Please redefine this function if you want to change default setting."
 ;;;
 
 (defvar mime-view-quitting-method-alist
-  '((mime/show-message-mode
-     . mime-view-quitting-method-for-mime/show-message-mode)))
+  '((mime-show-message-mode
+     . mime-view-quitting-method-for-mime-show-message-mode))
+  "Alist of major-mode vs. quitting-method of mime-view.")
 
 (defvar mime-view-over-to-previous-method-alist nil)
 (defvar mime-view-over-to-next-method-alist nil)
 
-(defvar mime-view-show-summary-method nil)
+(defvar mime-view-show-summary-method nil
+  "Alist of major-mode vs. show-summary-method.")
 
 
 ;;; @@ following method
 ;;;
 
-(defvar mime-view-following-method-alist nil)
+(defvar mime-view-following-method-alist nil
+  "Alist of major-mode vs. following-method of mime-view.")
 
 (defvar mime-view-following-required-fields-list
   '("From"))
@@ -412,81 +426,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
 ;;;
 
-(defun mime-view-setup-buffer (&optional ctl encoding ibuf obuf)
+(defun mime-view-setup-buffers (&optional ctl encoding ibuf obuf)
   (if ibuf
       (progn
        (get-buffer ibuf)
        (set-buffer ibuf)
        ))
   (or mime-view-redisplay
-      (setq mime::article/content-info (mime-parse-message ctl encoding))
+      (setq mime-raw-content-info (mime-parse-message ctl encoding))
       )
-  (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-content-info)
         (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))
-    (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-view-original-major-mode mode)
+      (setq major-mode 'mime-view-mode)
+      (setq mode-name "MIME-View")
       (while pcl
-       (setcar drest
-               (mime-preview/display-content (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)
-    (list obuf dest)
-    ))
+    )
+  (setq mime-view-buffer obuf)
+  )
 
-(defun mime-preview/display-content (content cinfo ibuf obuf)
-  (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))
+(defun mime-view-display-entity (content cinfo ibuf obuf)
+  "Display entity from content-info 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)
@@ -505,9 +498,10 @@ The compressed face will be piped to this command.")
     (set-buffer obuf)
     (setq nb (point))
     (narrow-to-region nb nb)
-    (mime-view-entity-button-function rcnum cinfo ctype params subj encoding)
+    (mime-view-entity-button-function
+     rcnum cinfo media-type media-subtype params subj encoding)
     (if (mime-view-header-visible-p rcnum cinfo)
-       (mime-preview/display-header beg he)
+       (mime-view-display-header beg he)
       )
     (if (and (null rcnum)
             (member
@@ -515,37 +509,36 @@ The compressed face will be piped to this command.")
        (save-excursion
          (goto-char (point-max))
          (mime-view-insert-entity-button
-          rcnum cinfo ctype params subj encoding)
+          rcnum cinfo media-type media-subtype params subj encoding)
          ))
-    (cond ((mime-view-body-visible-p rcnum cinfo ctype)
-          (mime-preview/display-body he end
+    (cond ((mime-view-body-visible-p rcnum cinfo media-type media-subtype)
+          (mime-view-display-body he end
                                      rcnum cinfo ctype params subj encoding)
           )
-         ((equal ctype "message/partial")
-          (mime-preview/display-message/partial)
+         ((and (eq media-type 'message)(eq media-subtype 'partial))
+          (mime-view-insert-message/partial-button)
           )
          ((and (null rcnum)
-               (null (mime::content-info/children cinfo))
+               (null (mime-entity-info-children cinfo))
                )
           (goto-char (point-max))
           (mime-view-insert-entity-button
-           rcnum cinfo ctype params subj encoding)
+           rcnum cinfo media-type media-subtype params subj encoding)
           ))
-    (mime-view-entity-separator-function rcnum cinfo ctype params subj)
-    (prog1
-       (progn
-         (setq ne (point-max))
-         (widen)
-         (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))
-    (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-view-original-major-mode
                        mime-view-content-header-filter-alist))))
       (if (functionp f)
          (funcall f)
@@ -554,11 +547,10 @@ The compressed face will be piped to this command.")
     (run-hooks 'mime-view-content-header-filter-hook)
     ))
 
-(defun mime-preview/display-body (beg end
-                                     rcnum cinfo ctype params subj encoding)
+(defun mime-view-display-body (beg end rcnum cinfo ctype params subj encoding)
   (save-restriction
     (narrow-to-region (point-max)(point-max))
-    (insert-buffer-substring mime::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)
@@ -566,18 +558,18 @@ The compressed face will be piped to this command.")
           )
       )))
 
-(defun mime-preview/display-message/partial ()
+(defun mime-view-insert-message/partial-button ()
   (save-restriction
     (goto-char (point-max))
     (if (not (search-backward "\n\n" nil t))
        (insert "\n")
       )
-    (let ((be (point-max)))
-      (narrow-to-region be be)
-      (insert mime-view-announcement-for-message/partial)
-      (mime-add-button (point-min)(point-max)
-                      (function mime-view-play-current-entity))
-      )))
+    (goto-char (point-max))
+    (narrow-to-region (point-max)(point-max))
+    (insert mime-view-announcement-for-message/partial)
+    (mime-add-button (point-min)(point-max)
+                    (function mime-view-play-current-entity))
+    ))
 
 (defun mime-article/get-uu-filename (param &optional encoding)
   (if (member (or encoding
@@ -607,16 +599,16 @@ The compressed face will be piped to this command.")
       ""))
 
 
-;;; @ content information
+;;; @ entity information
 ;;;
 
 (defun mime-article/point-content-number (p &optional cinfo)
   (or cinfo
-      (setq cinfo mime::article/content-info)
+      (setq cinfo mime-raw-content-info)
       )
-  (let ((b (mime::content-info/point-min cinfo))
-       (e (mime::content-info/point-max cinfo))
-       (c (mime::content-info/children cinfo))
+  (let ((b (mime-entity-info-point-min cinfo))
+       (e (mime-entity-info-point-max cinfo))
+       (c (mime-entity-info-children cinfo))
        )
     (if (and (<= b p)(<= p e))
        (or (let (co ret (sn 0))
@@ -632,27 +624,20 @@ The compressed face will be piped to this command.")
                  )))
            t))))
 
-(defun mime-article/rcnum-to-cinfo (rcnum &optional cinfo)
-  (or cinfo
-      (setq cinfo mime::article/content-info)
-      )
-  (find-if (function
-           (lambda (ci)
-             (equal (mime::content-info/rcnum ci) rcnum)
-             ))
-          (mime/flatten-content-info cinfo)
-          ))
+(defsubst mime-article/rcnum-to-cinfo (rnum &optional cinfo)
+  (mime-article/cnum-to-cinfo (reverse rnum) cinfo)
+  )
 
 (defun mime-article/cnum-to-cinfo (cn &optional cinfo)
   (or cinfo
-      (setq cinfo mime::article/content-info)
+      (setq cinfo mime-raw-content-info)
       )
   (if (eq cn t)
       cinfo
     (let ((sn (car cn)))
       (if (null sn)
          cinfo
-       (let ((rc (nth sn (mime::content-info/children cinfo))))
+       (let ((rc (nth sn (mime-entity-info-children cinfo))))
          (if rc
              (mime-article/cnum-to-cinfo (cdr cn) rc)
            ))
@@ -660,10 +645,10 @@ The compressed face will be piped to this command.")
 
 (defun mime/flatten-content-info (&optional cinfo)
   (or cinfo
-      (setq cinfo mime::article/content-info)
+      (setq cinfo mime-raw-content-info)
       )
   (let ((dest (list cinfo))
-       (rcl (mime::content-info/children cinfo))
+       (rcl (mime-entity-info-children cinfo))
        )
     (while rcl
       (setq dest (nconc dest (mime/flatten-content-info (car rcl))))
@@ -671,22 +656,32 @@ The compressed face will be piped to this command.")
       )
     dest))
 
-(defun mime-preview/point-pcinfo (p &optional pcl)
-  (or pcl
-      (setq pcl mime::preview/content-list)
-      )
-  (catch 'tag
-    (let ((r pcl) cell)
-      (while r
-       (setq cell (car r))
-       (if (and (<= (mime::preview-content-info/point-min cell) p)
-                (<= p (mime::preview-content-info/point-max cell))
-                )
-           (throw 'tag cell)
-         )
-       (setq r (cdr r))
-       ))
-    (car (last pcl))
+
+;;; @@ 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))
     ))
 
 
@@ -695,11 +690,11 @@ The compressed face will be piped to this command.")
 
 (defconst mime-view-menu-title "MIME-View")
 (defconst mime-view-menu-list
-  '((up                 "Move to upper content"      mime-view-up-content)
-    (previous   "Move to previous content"   mime-view-previous-content)
-    (next       "Move to next content"       mime-view-next-content)
-    (scroll-down "Scroll to previous content" mime-view-scroll-down-content)
-    (scroll-up  "Scroll to next content"     mime-view-scroll-up-content)
+  '((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)
@@ -733,21 +728,21 @@ The compressed face will be piped to this command.")
                              (make-sparse-keymap)
                              )))
     (define-key mime-view-mode-map
-      "u"        (function mime-view-up-content))
+      "u"        (function mime-view-move-to-upper))
     (define-key mime-view-mode-map
-      "p"        (function mime-view-previous-content))
+      "p"        (function mime-view-move-to-previous))
     (define-key mime-view-mode-map
-      "n"        (function mime-view-next-content))
+      "n"        (function mime-view-move-to-next))
     (define-key mime-view-mode-map
-      "\e\t"     (function mime-view-previous-content))
+      "\e\t"     (function mime-view-move-to-previous))
     (define-key mime-view-mode-map
-      "\t"       (function mime-view-next-content))
+      "\t"       (function mime-view-move-to-next))
     (define-key mime-view-mode-map
-      " "        (function mime-view-scroll-up-content))
+      " "        (function mime-view-scroll-up-entity))
     (define-key mime-view-mode-map
-      "\M- "     (function mime-view-scroll-down-content))
+      "\M- "     (function mime-view-scroll-down-entity))
     (define-key mime-view-mode-map
-      "\177"     (function mime-view-scroll-down-content))
+      "\177"     (function mime-view-scroll-down-entity))
     (define-key mime-view-mode-map
       "\C-m"     (function mime-view-next-line-content))
     (define-key mime-view-mode-map
@@ -759,23 +754,33 @@ The compressed face will be piped to this command.")
     (define-key mime-view-mode-map
       "\C-c\C-p" (function mime-view-print-current-entity))
     (define-key mime-view-mode-map
-      "a"        (function mime-view-follow-content))
+      "a"        (function mime-view-follow-current-entity))
     (define-key mime-view-mode-map
       "q"        (function mime-view-quit))
     (define-key mime-view-mode-map
       "h"        (function mime-view-show-summary))
     (define-key mime-view-mode-map
       "\C-c\C-x" (function mime-view-kill-buffer))
+    ;; (define-key mime-view-mode-map
+    ;;   "<"        (function beginning-of-buffer))
+    ;; (define-key mime-view-mode-map
+    ;;   ">"        (function end-of-buffer))
     (define-key mime-view-mode-map
-      "<"        (function beginning-of-buffer))
+      "?"        (function describe-mode))
     (define-key mime-view-mode-map
-      ">"        (function end-of-buffer))
+      [tab] (function mime-view-move-to-next))
     (define-key mime-view-mode-map
-      "?"        (function describe-mode))
+      [delete] (function mime-view-scroll-down-entity))
+    (define-key mime-view-mode-map
+      [backspace] (function mime-view-scroll-down-entity))
     (if (functionp default)
-       (setq mime-view-mode-map
-             (append mime-view-mode-map (list (cons t default)))
-             ))
+       (cond (running-xemacs
+              (set-keymap-default-binding mime-view-mode-map default)
+              )
+             (t
+              (setq mime-view-mode-map
+                    (append mime-view-mode-map (list (cons t default))))
+              )))
     (if mouse-button-2
        (define-key mime-view-mode-map
          mouse-button-2 (function mime-button-dispatcher))
@@ -802,6 +807,20 @@ The compressed face will be piped to this command.")
     (run-hooks 'mime-view-define-keymap-hook)
     ))
 
+(defsubst mime-maybe-hide-echo-buffer ()
+  "Clear mime-echo buffer and delete window for it."
+  (let ((buf (get-buffer mime-echo-buffer-name)))
+    (if buf
+       (save-excursion
+         (set-buffer buf)
+         (erase-buffer)
+         (let ((win (get-buffer-window buf)))
+           (if win
+               (delete-window win)
+             ))
+         (bury-buffer buf)
+         ))))
+
 (defun mime-view-mode (&optional mother ctl encoding ibuf obuf
                                 default-keymap-or-function)
   "Major mode for viewing MIME message.
@@ -828,57 +847,30 @@ button-2  Move to point under the mouse cursor
                and decode current content as `play mode'
 "
   (interactive)
-  (let ((buf (get-buffer mime/output-buffer-name)))
-    (if buf
-       (save-excursion
-         (set-buffer buf)
-         (erase-buffer)
-         )))
-  (let ((ret (mime-view-setup-buffer ctl encoding ibuf obuf))
+  (mime-maybe-hide-echo-buffer)
+  (let ((ret (mime-view-setup-buffers ctl encoding ibuf obuf))
        (win-conf (current-window-configuration))
        )
     (prog1
-       (switch-to-buffer (car ret))
+       (switch-to-buffer ret)
       (setq mime::preview/original-window-configuration win-conf)
       (if mother
          (progn
-           (setq mime::preview/mother-buffer mother)
+           (setq mime-mother-buffer mother)
            ))
       (mime-view-define-keymap default-keymap-or-function)
-      (setq mime::preview/content-list (nth 1 ret))
-      (goto-char
-       (let ((ce (mime::preview-content-info/point-max
-                 (car mime::preview/content-list)
-                 ))
-            e)
-        (goto-char (point-min))
-        (search-forward "\n\n" nil t)
-        (setq e (match-end 0))
-        (if (<= e ce)
-            e
-          ce)))
+      (let ((point (next-single-property-change (point-min) 'mime-view-cinfo)))
+       (if point
+           (goto-char point)
+         (goto-char (point-min))
+         (search-forward "\n\n" nil t)
+         ))
       (run-hooks 'mime-view-mode-hook)
       )))
 
-(defun mime-preview/point-content-number (point)
-  (save-window-excursion
-    (let ((pc (mime-preview/point-pcinfo (point)))
-         cinfo)
-      (switch-to-buffer (mime::preview-content-info/buffer pc))
-      (setq cinfo (mime::preview-content-info/content-info pc))
-      (mime-article/point-content-number (mime::content-info/point-min cinfo))
-      )))
 
-(defun mime-preview/cinfo-to-pcinfo (cinfo)
-  (let ((rpcl mime::preview/content-list) cell)
-    (catch 'tag
-      (while rpcl
-       (setq cell (car rpcl))
-       (if (eq cinfo (mime::preview-content-info/content-info cell))
-           (throw 'tag cell)
-         )
-       (setq rpcl (cdr rpcl))
-       ))))
+;;; @@ playing
+;;;
 
 (autoload 'mime-view-play-current-entity "mime-play" "Play current entity." t)
 
@@ -886,7 +878,7 @@ button-2    Move to point under the mouse cursor
   "Extract current entity into file (maybe).
 It decodes current entity to call internal or external method as
 \"extract\" mode.  The method is selected from variable
-`mime/content-decoding-condition'."
+`mime-acting-condition'."
   (interactive)
   (mime-view-play-current-entity "extract")
   )
@@ -895,292 +887,315 @@ It decodes current entity to call internal or external method as
   "Print current entity (maybe).
 It decodes current entity to call internal or external method as
 \"print\" mode.  The method is selected from variable
-`mime/content-decoding-condition'."
+`mime-acting-condition'."
   (interactive)
   (mime-view-play-current-entity "print")
   )
 
-(defun mime-view-follow-content ()
+
+;;; @@ following
+;;;
+
+(defun mime-view-get-original-major-mode ()
+  "Return major-mode of original buffer.
+If a current buffer has mime-mother-buffer, return original major-mode
+of the mother-buffer."
+  (if mime-mother-buffer
+      (save-excursion
+       (set-buffer mime-mother-buffer)
+       (mime-view-get-original-major-mode)
+       )
+    mime-view-original-major-mode))
+
+(defun mime-view-follow-current-entity ()
+  "Write follow message to current entity.
+It calls following-method selected from variable
+`mime-view-following-method-alist'."
   (interactive)
-  (let ((root-cinfo
-        (mime::preview-content-info/content-info
-         (car mime::preview/content-list)))
-       pc p-beg p-end cinfo rcnum)
-    (let ((rest mime::preview/content-list)
-         b e cell len rc)
-      (if (catch 'tag
-           (while (setq cell (car rest))
-             (setq b (mime::preview-content-info/point-min cell)
-                   e (mime::preview-content-info/point-max cell))
-             (setq rest (cdr rest))
-             (if (and (<= b (point))(<= (point) e))
-                 (throw 'tag cell)
-               )
-             ))
-         (progn
-           (setq pc cell
-                 cinfo (mime::preview-content-info/content-info pc)
-                 rcnum (mime::content-info/rcnum cinfo))
-           (setq len (length rcnum))
-           (setq p-beg (mime::preview-content-info/point-min pc)
-                 p-end (mime::preview-content-info/point-max pc))
-           (while (and (setq cell (car rest))
-                       (progn
-                         (setq rc
-                               (mime::content-info/rcnum
-                                (mime::preview-content-info/content-info
-                                 cell)))
-                         (equal rcnum
-                                (nthcdr (- (length rc) len) rc))
-                         ))
-             (setq p-end (mime::preview-content-info/point-max cell))
-             (setq rest (cdr rest))
-             ))))
-    (if pc
-       (let* ((mode (mime-preview/get-original-major-mode))
-              (new-name (format "%s-%s" (buffer-name) (reverse rcnum)))
-              new-buf
-              (the-buf (current-buffer))
-              (a-buf mime::preview/article-buffer)
-              fields)
-         (save-excursion
-           (set-buffer (setq new-buf (get-buffer-create new-name)))
-           (erase-buffer)
-           (insert-buffer-substring the-buf p-beg p-end)
-           (goto-char (point-min))
-           (if (mime-view-header-visible-p rcnum root-cinfo)
-               (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 ((rcnum (mime::content-info/rcnum cinfo)) ci str)
-             (while (progn
-                      (setq str
-                            (save-excursion
-                              (set-buffer a-buf)
-                              (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)
-                                 )
-                                (std11-header-string-except
-                                 (concat "^"
-                                         (apply (function regexp-or) fields)
-                                         ":") ""))))
-                      (if (string= (mime::content-info/type ci)
-                                   "message/rfc822")
-                          nil
-                        (if str
-                            (insert str)
-                          )
-                        rcnum))
-               (setq fields (std11-collect-field-names)
-                     rcnum (cdr rcnum))
-               )
+  (let ((root-cinfo (get-text-property (point-min) 'mime-view-cinfo))
+       cinfo)
+    (while (null (setq cinfo (get-text-property (point) 'mime-view-cinfo)))
+      (backward-char)
+      )
+    (let* ((p-beg (previous-single-property-change (point) 'mime-view-cinfo))
+          p-end
+          (rcnum (mime-entity-info-rnum cinfo))
+          (len (length rcnum))
+          )
+      (cond ((null p-beg)
+            (setq p-beg
+                  (if (eq (next-single-property-change (point-min)
+                                                       'mime-view-cinfo)
+                          (point))
+                      (point)
+                    (point-min)))
+            )
+           ((eq (next-single-property-change p-beg 'mime-view-cinfo)
+                (point))
+            (setq p-beg (point))
+            ))
+      (setq p-end (next-single-property-change p-beg 'mime-view-cinfo))
+      (cond ((null p-end)
+            (setq p-end (point-max))
+            )
+           ((null rcnum)
+            (setq p-end (point-max))
+            )
+           (t
+            (save-excursion
+              (goto-char p-end)
+              (catch 'tag
+                (let (e)
+                  (while (setq e
+                               (next-single-property-change
+                                (point) 'mime-view-cinfo))
+                    (goto-char e)
+                    (let ((rc (mime-entity-info-rnum
+                               (get-text-property (point)
+                                                  'mime-view-cinfo))))
+                      (or (equal rcnum (nthcdr (- (length rc) len) rc))
+                          (throw 'tag nil)
+                          ))
+                    (setq p-end e)
+                    ))
+                (setq p-end (point-max))
+                ))
+            ))
+      (let* ((mode (mime-view-get-original-major-mode))
+            (new-name (format "%s-%s" (buffer-name) (reverse rcnum)))
+            new-buf
+            (the-buf (current-buffer))
+            (a-buf mime-raw-buffer)
+            fields)
+       (save-excursion
+         (set-buffer (setq new-buf (get-buffer-create new-name)))
+         (erase-buffer)
+         (insert-buffer-substring the-buf p-beg p-end)
+         (goto-char (point-min))
+         (if (mime-view-header-visible-p rcnum root-cinfo)
+             (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 ((rcnum (mime-entity-info-rnum cinfo)) ci str)
+           (while (progn
+                    (setq str
+                          (save-excursion
+                            (set-buffer a-buf)
+                            (setq ci (mime-article/rcnum-to-cinfo rcnum))
+                            (save-restriction
+                              (narrow-to-region
+                               (mime-entity-info-point-min ci)
+                               (mime-entity-info-point-max ci)
+                               )
+                              (std11-header-string-except
+                               (concat "^"
+                                       (apply (function regexp-or) fields)
+                                       ":") ""))))
+                    (if (and
+                         (eq (mime-entity-info-media-type ci) 'message)
+                         (eq (mime-entity-info-media-subtype ci) 'rfc822))
+                        nil
+                      (if str
+                          (insert str)
+                        )
+                      rcnum))
+             (setq fields (std11-collect-field-names)
+                   rcnum (cdr rcnum))
              )
-           (let ((rest mime-view-following-required-fields-list))
-             (while rest
-               (let ((field-name (car rest)))
-                 (or (std11-field-body field-name)
-                     (insert
-                      (format
-                       (concat field-name
-                               ": "
-                               (save-excursion
-                                 (set-buffer the-buf)
-                                 (set-buffer mime::preview/mother-buffer)
-                                 (set-buffer mime::preview/article-buffer)
-                                 (std11-field-body field-name)
-                                 )
-                               "\n")))
-                     ))
-               (setq rest (cdr rest))
-               ))
-           (eword-decode-header)
            )
-         (let ((f (cdr (assq mode mime-view-following-method-alist))))
-           (if (functionp f)
-               (funcall f new-buf)
-             (message
-              (format
-               "Sorry, following method for %s is not implemented yet."
-               mode))
+         (let ((rest mime-view-following-required-fields-list))
+           (while rest
+             (let ((field-name (car rest)))
+               (or (std11-field-body field-name)
+                   (insert
+                    (format
+                     (concat field-name
+                             ": "
+                             (save-excursion
+                               (set-buffer the-buf)
+                               (set-buffer mime-mother-buffer)
+                               (set-buffer mime-raw-buffer)
+                               (std11-field-body field-name)
+                               )
+                             "\n")))
+                   ))
+             (setq rest (cdr rest))
              ))
-         ))))
+         (eword-decode-header)
+         )
+       (let ((f (cdr (assq mode mime-view-following-method-alist))))
+         (if (functionp f)
+             (funcall f new-buf)
+           (message
+            (format
+             "Sorry, following method for %s is not implemented yet."
+             mode))
+           ))
+       ))))
+
+
+;;; @@ X-Face
+;;;
 
 (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)
     ))
 
-(defun mime-view-up-content ()
+
+;;; @@ moving
+;;;
+
+(defun mime-view-move-to-upper ()
+  "Move to upper entity.
+If there is no upper entity, call function `mime-view-quit'."
   (interactive)
-  (let* ((pc (mime-preview/point-pcinfo (point)))
-        (cinfo (mime::preview-content-info/content-info pc))
-        (rcnum (mime::content-info/rcnum cinfo))
-        )
-    (if rcnum
-       (let ((r (save-excursion
-                  (set-buffer (mime::preview-content-info/buffer pc))
-                   (mime-article/rcnum-to-cinfo (cdr rcnum))
-                  ))
-             (rpcl mime::preview/content-list)
-             cell)
-         (while (and
-                 (setq cell (car rpcl))
-                 (not (eq r (mime::preview-content-info/content-info cell)))
-                 )
-           (setq rpcl (cdr rpcl))
+  (let (cinfo)
+    (while (null (setq cinfo (get-text-property (point) 'mime-view-cinfo)))
+      (backward-char)
+      )
+    (let ((r (mime-article/rcnum-to-cinfo
+             (cdr (mime-entity-info-rnum cinfo))
+             (get-text-property 1 'mime-view-cinfo)))
+         point)
+      (catch 'tag
+       (while (setq point (previous-single-property-change
+                           (point) 'mime-view-cinfo))
+         (goto-char point)
+         (if (eq r (get-text-property (point) 'mime-view-cinfo))
+             (throw 'tag t)
            )
-         (goto-char (mime::preview-content-info/point-min cell))
          )
-      (mime-view-quit)
-      )))
+       (mime-view-quit)
+       ))))
 
-(defun mime-view-previous-content ()
+(defun mime-view-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'."
   (interactive)
-  (let* ((pcl mime::preview/content-list)
-        (p (point))
-        (i (- (length pcl) 1))
-        beg)
-    (catch 'tag
-      (while (> i 0)
-       (setq beg (mime::preview-content-info/point-min (nth i pcl)))
-       (if (> p beg)
-           (throw 'tag (goto-char beg))
-         )
-       (setq i (- i 1))
-       )
-      (let ((f (assq mime::preview/original-major-mode
+  (while (null (get-text-property (point) 'mime-view-cinfo))
+    (backward-char)
+    )
+  (let ((point (previous-single-property-change (point) 'mime-view-cinfo)))
+    (if point
+       (goto-char point)
+      (let ((f (assq mime-view-original-major-mode
                     mime-view-over-to-previous-method-alist)))
        (if f
            (funcall (cdr f))
          ))
-      )
-    ))
+      )))
 
-(defun mime-view-next-content ()
+(defun mime-view-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'."
   (interactive)
-  (let ((pcl mime::preview/content-list)
-       (p (point))
-       beg)
-    (catch 'tag
-      (while pcl
-       (setq beg (mime::preview-content-info/point-min (car pcl)))
-       (if (< p beg)
-           (throw 'tag (goto-char beg))
-         )
-       (setq pcl (cdr pcl))
-       )
-      (let ((f (assq mime::preview/original-major-mode
+  (let ((point (next-single-property-change (point) 'mime-view-cinfo)))
+    (if point
+       (goto-char point)
+      (let ((f (assq mime-view-original-major-mode
                     mime-view-over-to-next-method-alist)))
        (if f
            (funcall (cdr f))
          ))
-      )
-    ))
+      )))
 
-(defun mime-view-scroll-up-content (&optional h)
+(defun mime-view-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'."
   (interactive)
   (or h
-      (setq h (- (window-height) 1))
+      (setq h (1- (window-height)))
       )
   (if (= (point) (point-max))
-      (let ((f (assq mime::preview/original-major-mode
+      (let ((f (assq mime-view-original-major-mode
                      mime-view-over-to-next-method-alist)))
         (if f
             (funcall (cdr f))
           ))
-    (let ((pcl mime::preview/content-list)
-          (p (point))
-          np beg)
-      (setq np
-            (or (catch 'tag
-                  (while pcl
-                    (setq beg (mime::preview-content-info/point-min (car pcl)))
-                    (if (< p beg)
-                        (throw 'tag beg)
-                      )
-                    (setq pcl (cdr pcl))
-                    ))
-                (point-max)))
+    (let ((point
+          (or (next-single-property-change (point) 'mime-view-cinfo)
+              (point-max))))
       (forward-line h)
-      (if (> (point) np)
-          (goto-char np)
+      (if (> (point) point)
+          (goto-char point)
         )
-      ;;(show-subtree)
-      ))
-  )
+      )))
 
-(defun mime-view-scroll-down-content (&optional h)
+(defun mime-view-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'."
   (interactive)
   (or h
-      (setq h (- (window-height) 1))
+      (setq h (1- (window-height)))
       )
   (if (= (point) (point-min))
-      (let ((f (assq mime::preview/original-major-mode
+      (let ((f (assq mime-view-original-major-mode
                      mime-view-over-to-previous-method-alist)))
         (if f
             (funcall (cdr f))
           ))
-    (let ((pcl mime::preview/content-list)
-          (p (point))
-          pp beg)
-      (setq pp
-            (or (let ((i (- (length pcl) 1)))
-                  (catch 'tag
-                    (while (> i 0)
-                      (setq beg (mime::preview-content-info/point-min
-                                 (nth i pcl)))
-                      (if (> p beg)
-                          (throw 'tag beg)
-                        )
-                      (setq i (- i 1))
-                      )))
-                (point-min)))
+    (let (point)
+      (save-excursion
+       (catch 'tag
+         (while (> (point) 1)
+           (if (setq point
+                     (previous-single-property-change (point)
+                                                      'mime-view-cinfo))
+               (throw 'tag t)
+             )
+           (backward-char)
+           )
+         (setq point (point-min))
+         ))
       (forward-line (- h))
-      (if (< (point) pp)
-          (goto-char pp)
-        )))
-  )
+      (if (< (point) point)
+          (goto-char point)
+        ))))
 
 (defun mime-view-next-line-content ()
   (interactive)
-  (mime-view-scroll-up-content 1)
+  (mime-view-scroll-up-entity 1)
   )
 
 (defun mime-view-previous-line-content ()
   (interactive)
-  (mime-view-scroll-down-content 1)
+  (mime-view-scroll-down-entity 1)
   )
 
+
+;;; @@ quitting
+;;;
+
 (defun mime-view-quit ()
+  "Quit from MIME-View buffer.
+It calls function registered in variable
+`mime-view-quitting-method-alist'."
   (interactive)
-  (let ((r (save-excursion
-            (set-buffer (mime::preview-content-info/buffer
-                         (mime-preview/point-pcinfo (point))))
-            (assq major-mode mime-view-quitting-method-alist)
-            )))
+  (let ((r (assq mime-view-original-major-mode
+                mime-view-quitting-method-alist)))
     (if r
        (funcall (cdr r))
       )))
 
 (defun mime-view-show-summary ()
+  "Show summary.
+It calls function registered in variable
+`mime-view-show-summary-method'."
   (interactive)
-  (let ((r (save-excursion
-            (set-buffer
-             (mime::preview-content-info/buffer
-              (mime-preview/point-pcinfo (point)))
-             )
-            (assq major-mode mime-view-show-summary-method)
-            )))
+  (let ((r (assq mime-view-original-major-mode
+                mime-view-show-summary-method)))
     (if r
        (funcall (cdr r))
       )))