Rename `mime-view-show-summary' -> `mime-preview-show-summary'.
[elisp/semi.git] / mime-view.el
index ef05a15..6c6b38e 100644 (file)
@@ -205,7 +205,7 @@ Each elements are regexp of field-name.")
                     "\n\t")
                 rest)))
            )))
-   (function mime-view-play-current-entity))
+   (function mime-preview-play-current-entity))
   )
 
 (defun mime-view-entity-button-function (rcnum cinfo
@@ -297,25 +297,27 @@ Please redefine this function if you want to change default setting."
 ;;; @@@ in raw buffer
 ;;;
 
-(defvar mime-raw-content-info
+(defvar mime-raw-entity-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.
+Please use reference function `mime-entity-info-SLOT' to get value of
+SLOT.
 
 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)
+type           media-type (symbol)
+subtype                media-subtype (symbol)
+type/subtype   media-type/subtype (string or nil)
 parameters     parameter of Content-Type field (association list)
 encoding       Content-Transfer-Encoding (string or nil)
 children       entities included in this entity (list of content-infos)
 
-If 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)
+If an entity includes other entities in its body, such as multipart or
+message/rfc822, entity-infos of other entities are included in
+`children', so entity-info become a tree.")
+(make-variable-buffer-local 'mime-raw-entity-info)
 
 (defvar mime-view-buffer nil
   "MIME View buffer corresponding with the (raw) buffer.")
@@ -409,9 +411,9 @@ The compressed face will be piped to this command.")
        (set-buffer ibuf)
        ))
   (or mime-view-redisplay
-      (setq mime-raw-content-info (mime-parse-message ctl encoding))
+      (setq mime-raw-entity-info (mime-parse-message ctl encoding))
       )
-  (let* ((cinfo mime-raw-content-info)
+  (let* ((cinfo mime-raw-entity-info)
         (pcl (mime/flatten-content-info cinfo))
         (the-buf (current-buffer))
         (mode major-mode)
@@ -541,7 +543,7 @@ The compressed face will be piped to this command.")
     (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))
+                    (function mime-preview-play-current-entity))
     ))
 
 (defun mime-article/get-uu-filename (param &optional encoding)
@@ -577,7 +579,7 @@ The compressed face will be piped to this command.")
 
 (defun mime-article/point-content-number (p &optional cinfo)
   (or cinfo
-      (setq cinfo mime-raw-content-info)
+      (setq cinfo mime-raw-entity-info)
       )
   (let ((b (mime-entity-info-point-min cinfo))
        (e (mime-entity-info-point-max cinfo))
@@ -603,7 +605,7 @@ The compressed face will be piped to this command.")
 
 (defun mime-article/cnum-to-cinfo (cn &optional cinfo)
   (or cinfo
-      (setq cinfo mime-raw-content-info)
+      (setq cinfo mime-raw-entity-info)
       )
   (if (eq cn t)
       cinfo
@@ -618,7 +620,7 @@ The compressed face will be piped to this command.")
 
 (defun mime/flatten-content-info (&optional cinfo)
   (or cinfo
-      (setq cinfo mime-raw-content-info)
+      (setq cinfo mime-raw-entity-info)
       )
   (let ((dest (list cinfo))
        (rcl (mime-entity-info-children cinfo))
@@ -663,15 +665,15 @@ 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-move-to-upper)
-    (previous   "Move to previous content"   mime-view-move-to-previous)
-    (next       "Move to next content"       mime-view-move-to-next)
-    (scroll-down "Scroll to previous content" mime-view-scroll-down-entity)
-    (scroll-up  "Scroll to next content"     mime-view-scroll-up-entity)
-    (play       "Play Content"               mime-view-play-current-entity)
-    (extract    "Extract Content"            mime-view-extract-current-entity)
-    (print      "Print"                      mime-view-print-current-entity)
-    (x-face     "Show X Face"                mime-view-display-x-face)
+  '((up                 "Move to upper entity"    mime-preview-move-to-upper)
+    (previous   "Move to previous entity" mime-preview-move-to-previous)
+    (next       "Move to next entity"     mime-preview-move-to-next)
+    (scroll-down "Scroll-down"             mime-preview-scroll-down-entity)
+    (scroll-up  "Scroll-up"               mime-preview-scroll-up-entity)
+    (play       "Play current entity"     mime-preview-play-current-entity)
+    (extract    "Extract current entity"  mime-preview-extract-current-entity)
+    (print      "Print current entity"    mime-preview-print-current-entity)
+    (x-face     "Show X Face"             mime-view-display-x-face)
     )
   "Menu for MIME Viewer")
 
@@ -701,37 +703,37 @@ The compressed face will be piped to this command.")
                              (make-sparse-keymap)
                              )))
     (define-key mime-view-mode-map
-      "u"        (function mime-view-move-to-upper))
+      "u"        (function mime-preview-move-to-upper))
     (define-key mime-view-mode-map
-      "p"        (function mime-view-move-to-previous))
+      "p"        (function mime-preview-move-to-previous))
     (define-key mime-view-mode-map
-      "n"        (function mime-view-move-to-next))
+      "n"        (function mime-preview-move-to-next))
     (define-key mime-view-mode-map
-      "\e\t"     (function mime-view-move-to-previous))
+      "\e\t"     (function mime-preview-move-to-previous))
     (define-key mime-view-mode-map
-      "\t"       (function mime-view-move-to-next))
+      "\t"       (function mime-preview-move-to-next))
     (define-key mime-view-mode-map
-      " "        (function mime-view-scroll-up-entity))
+      " "        (function mime-preview-scroll-up-entity))
     (define-key mime-view-mode-map
-      "\M- "     (function mime-view-scroll-down-entity))
+      "\M- "     (function mime-preview-scroll-down-entity))
     (define-key mime-view-mode-map
-      "\177"     (function mime-view-scroll-down-entity))
+      "\177"     (function mime-preview-scroll-down-entity))
     (define-key mime-view-mode-map
-      "\C-m"     (function mime-view-next-line-content))
+      "\C-m"     (function mime-preview-next-line-entity))
     (define-key mime-view-mode-map
-      "\C-\M-m"  (function mime-view-previous-line-content))
+      "\C-\M-m"  (function mime-preview-previous-line-entity))
     (define-key mime-view-mode-map
-      "v"        (function mime-view-play-current-entity))
+      "v"        (function mime-preview-play-current-entity))
     (define-key mime-view-mode-map
-      "e"        (function mime-view-extract-current-entity))
+      "e"        (function mime-preview-extract-current-entity))
     (define-key mime-view-mode-map
-      "\C-c\C-p" (function mime-view-print-current-entity))
+      "\C-c\C-p" (function mime-preview-print-current-entity))
     (define-key mime-view-mode-map
-      "a"        (function mime-view-follow-current-entity))
+      "a"        (function mime-preview-follow-current-entity))
     (define-key mime-view-mode-map
-      "q"        (function mime-view-quit))
+      "q"        (function mime-preview-quit))
     (define-key mime-view-mode-map
-      "h"        (function mime-view-show-summary))
+      "h"        (function mime-preview-show-summary))
     (define-key mime-view-mode-map
       "\C-c\C-x" (function mime-view-kill-buffer))
     ;; (define-key mime-view-mode-map
@@ -741,11 +743,11 @@ The compressed face will be piped to this command.")
     (define-key mime-view-mode-map
       "?"        (function describe-mode))
     (define-key mime-view-mode-map
-      [tab] (function mime-view-move-to-next))
+      [tab] (function mime-preview-move-to-next))
     (define-key mime-view-mode-map
-      [delete] (function mime-view-scroll-down-entity))
+      [delete] (function mime-preview-scroll-down-entity))
     (define-key mime-view-mode-map
-      [backspace] (function mime-view-scroll-down-entity))
+      [backspace] (function mime-preview-scroll-down-entity))
     (if (functionp default)
        (cond (running-xemacs
               (set-keymap-default-binding mime-view-mode-map default)
@@ -845,24 +847,25 @@ button-2  Move to point under the mouse cursor
 ;;; @@ playing
 ;;;
 
-(autoload 'mime-view-play-current-entity "mime-play" "Play current entity." t)
+(autoload 'mime-preview-play-current-entity "mime-play"
+  "Play current entity." t)
 
-(defun mime-view-extract-current-entity ()
+(defun mime-preview-extract-current-entity ()
   "Extract current entity into file (maybe).
 It decodes current entity to call internal or external method as
 \"extract\" mode.  The method is selected from variable
 `mime-acting-condition'."
   (interactive)
-  (mime-view-play-current-entity "extract")
+  (mime-preview-play-current-entity "extract")
   )
 
-(defun mime-view-print-current-entity ()
+(defun mime-preview-print-current-entity ()
   "Print current entity (maybe).
 It decodes current entity to call internal or external method as
 \"print\" mode.  The method is selected from variable
 `mime-acting-condition'."
   (interactive)
-  (mime-view-play-current-entity "print")
+  (mime-preview-play-current-entity "print")
   )
 
 
@@ -880,7 +883,7 @@ of the mother-buffer."
        )
     mime-view-original-major-mode))
 
-(defun mime-view-follow-current-entity ()
+(defun mime-preview-follow-current-entity ()
   "Write follow message to current entity.
 It calls following-method selected from variable
 `mime-view-following-method-alist'."
@@ -1026,9 +1029,9 @@ It calls following-method selected from variable
 ;;; @@ moving
 ;;;
 
-(defun mime-view-move-to-upper ()
+(defun mime-preview-move-to-upper ()
   "Move to upper entity.
-If there is no upper entity, call function `mime-view-quit'."
+If there is no upper entity, call function `mime-preview-quit'."
   (interactive)
   (let (cinfo)
     (while (null (setq cinfo (get-text-property (point) 'mime-view-cinfo)))
@@ -1046,10 +1049,10 @@ If there is no upper entity, call function `mime-view-quit'."
              (throw 'tag t)
            )
          )
-       (mime-view-quit)
+       (mime-preview-quit)
        ))))
 
-(defun mime-view-move-to-previous ()
+(defun mime-preview-move-to-previous ()
   "Move to previous entity.
 If there is no previous entity, it calls function registered in
 variable `mime-view-over-to-previous-method-alist'."
@@ -1067,7 +1070,7 @@ variable `mime-view-over-to-previous-method-alist'."
          ))
       )))
 
-(defun mime-view-move-to-next ()
+(defun mime-preview-move-to-next ()
   "Move to next entity.
 If there is no previous entity, it calls function registered in
 variable `mime-view-over-to-next-method-alist'."
@@ -1082,7 +1085,7 @@ variable `mime-view-over-to-next-method-alist'."
          ))
       )))
 
-(defun mime-view-scroll-up-entity (&optional h)
+(defun mime-preview-scroll-up-entity (&optional h)
   "Scroll up current entity.
 If reached to (point-max), it calls function registered in variable
 `mime-view-over-to-next-method-alist'."
@@ -1105,7 +1108,7 @@ If reached to (point-max), it calls function registered in variable
         )
       )))
 
-(defun mime-view-scroll-down-entity (&optional h)
+(defun mime-preview-scroll-down-entity (&optional h)
   "Scroll down current entity.
 If reached to (point-min), it calls function registered in variable
 `mime-view-over-to-previous-method-alist'."
@@ -1137,21 +1140,21 @@ If reached to (point-min), it calls function registered in variable
           (goto-char point)
         ))))
 
-(defun mime-view-next-line-content ()
+(defun mime-preview-next-line-entity ()
   (interactive)
-  (mime-view-scroll-up-entity 1)
+  (mime-preview-scroll-up-entity 1)
   )
 
-(defun mime-view-previous-line-content ()
+(defun mime-preview-previous-line-entity ()
   (interactive)
-  (mime-view-scroll-down-entity 1)
+  (mime-preview-scroll-down-entity 1)
   )
 
 
 ;;; @@ quitting
 ;;;
 
-(defun mime-view-quit ()
+(defun mime-preview-quit ()
   "Quit from MIME-View buffer.
 It calls function registered in variable
 `mime-view-quitting-method-alist'."
@@ -1162,7 +1165,7 @@ It calls function registered in variable
        (funcall (cdr r))
       )))
 
-(defun mime-view-show-summary ()
+(defun mime-preview-show-summary ()
   "Show summary.
 It calls function registered in variable
 `mime-view-show-summary-method'."