" (" (car semi-version) ")"))
-;;; @ variables
+;;; @ variables or settings
;;;
(defvar mime-acting-condition
- '(((type . "text/plain")
- (method "tm-plain" nil 'file 'type 'encoding 'mode 'name)
+ '(((type . text)(subtype . plain)
+ (method "tm-plain" nil 'file "" 'encoding 'mode 'name)
(mode "play" "print")
)
- ((type . "text/html")
- (method "tm-html" nil 'file 'type 'encoding 'mode 'name)
+ ((type . text)(subtype . html)
+ (method "tm-html" nil 'file "" 'encoding 'mode 'name)
(mode . "play")
)
- ((type . "text/x-rot13-47")
+ ((type . text)(subtype . x-rot13-47)
(method . mime-method-to-display-caesar)
(mode . "play")
)
- ((type . "text/x-rot13-47-48")
+ ((type . text)(subtype . x-rot13-47-48)
(method . mime-method-to-display-caesar)
(mode . "play")
)
- ((type . "audio/basic")
- (method "tm-au" nil 'file 'type 'encoding 'mode 'name)
+
+ ((type . audio)(subtype . basic)
+ (method "tm-au" nil 'file "" 'encoding 'mode 'name)
(mode . "play")
)
- ((type . "image/jpeg")
- (method "tm-image" nil 'file 'type 'encoding 'mode 'name)
- (mode "play" "print")
- )
- ((type . "image/gif")
- (method "tm-image" nil 'file 'type 'encoding 'mode 'name)
- (mode "play" "print")
- )
- ((type . "image/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")
- )
- ((type . "image/x-tiff")
- (method "tm-image" nil 'file 'type 'encoding 'mode 'name)
- (mode "play" "print")
- )
- ((type . "image/x-xbm")
- (method "tm-image" nil 'file 'type 'encoding 'mode 'name)
- (mode "play" "print")
- )
- ((type . "image/x-pic")
- (method "tm-image" nil 'file 'type 'encoding 'mode 'name)
- (mode "play" "print")
- )
- ((type . "image/x-mag")
- (method "tm-image" nil 'file 'type 'encoding 'mode 'name)
+ ((type . image)
+ (method "tm-image" nil 'file "" 'encoding 'mode 'name)
(mode "play" "print")
)
- ((type . "video/mpeg")
- (method "tm-mpeg" nil 'file 'type 'encoding 'mode 'name)
+ ((type . video)(subtype . mpeg)
+ (method "tm-mpeg" nil 'file "" 'encoding 'mode 'name)
(mode . "play")
)
- ((type . "application/postscript")
- (method "tm-ps" nil 'file 'type 'encoding 'mode 'name)
+ ((type . application)(subtype . postscript)
+ (method "tm-ps" nil 'file "" 'encoding 'mode 'name)
(mode "play" "print")
)
- ((type . "application/octet-stream")
+ ((type . application)(subtype . octet-stream)
(method . mime-method-to-save)(mode "play" "print")
)
- ((type . "message/external-body")
+ ((type . message)(subtype . external-body)
("access-type" . "anon-ftp")
(method . mime-method-to-display-message/external-ftp)
)
- ((type . "message/rfc822")
+ ((type . message)(subtype . rfc822)
(method . mime-method-to-display-message/rfc822)
(mode . "play")
)
- ((type . "message/partial")
+ ((type . message)(subtype . partial)
(method . mime-method-to-store-message/partial)
(mode . "play")
)
((method . mime-method-to-save)(mode . "extract"))
))
-(defvar mime-view-childrens-header-showing-Content-Type-list
- '("message/rfc822" "message/news"))
-
(defvar mime-view-visible-media-type-list
'("text/plain" nil "text/richtext" "text/enriched"
"text/rfc822-headers"
"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-View buffer.
+ "*List of media-types to be able to display in MIME-preview buffer.
Each elements are string of TYPE/SUBTYPE, e.g. \"text/plain\".")
(defvar mime-view-content-button-visible-ctype-list
(defvar mime-view-uuencode-encoding-name-list '("x-uue" "x-uuencode"))
-(defvar mime-view-ignored-field-list
- '(".*Received" ".*Path" ".*Id" "References"
- "Replied" "Errors-To"
- "Lines" "Sender" ".*Host" "Xref"
- "Content-Type" "Precedence"
- "Status" "X-VM-.*")
- "All fields that match this list will be hidden in MIME preview buffer.
-Each elements are regexp of field-name. [mime-view.el]")
-
-(defvar mime-view-ignored-field-regexp
- (concat "^"
- (apply (function regexp-or) mime-view-ignored-field-list)
- ":"))
-
-(defvar mime-view-visible-field-list '("Dnas.*" "Message-Id")
- "All fields that match this list will be displayed in MIME preview buffer.
-Each elements are regexp of field-name.")
-
(defvar mime-view-redisplay nil)
(defvar mime-view-announcement-for-message/partial
;;; @@ entity button
;;;
-(defun mime-view-insert-entity-button (rcnum cinfo
- media-type media-subtype params
- subj encoding)
+(defun mime-view-insert-entity-button (entity-node-id
+ cinfo
+ media-type media-subtype params
+ subj encoding)
"Insert entity-button."
(mime-insert-button
(let ((access-type (assoc "access-type" params))
(num (or (cdr (assoc "x-part-number" params))
- (if (consp rcnum)
+ (if (consp entity-node-id)
(mapconcat (function
(lambda (num)
(format "%s" (1+ num))
))
- (reverse rcnum) ".")
+ (reverse entity-node-id) ".")
"0"))
))
(cond (access-type
"\n\t")
rest)))
)))
- (function mime-view-play-current-entity))
+ (function mime-preview-play-current-entity))
)
-(defun mime-view-entity-button-function (rcnum cinfo
- media-type media-subtype
- params subj encoding)
+(defun mime-view-entity-button-function (entity-node-id
+ 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)
+ (or (null entity-node-id)
(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)))
+ (mime-raw-entity-node-id-to-entity-info
+ (cdr entity-node-id) 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)
+ entity-node-id cinfo media-type media-subtype params subj encoding)
))
;;; @@ content header filter
;;;
+(defvar mime-view-ignored-field-list
+ '(".*Received" ".*Path" ".*Id" "References"
+ "Replied" "Errors-To"
+ "Lines" "Sender" ".*Host" "Xref"
+ "Content-Type" "Precedence"
+ "Status" "X-VM-.*")
+ "All fields that match this list will be hidden in MIME preview buffer.
+Each elements are regexp of field-name.")
+
+(defvar mime-view-ignored-field-regexp
+ (concat "^"
+ (apply (function regexp-or) mime-view-ignored-field-list)
+ ":"))
+
+(defvar mime-view-visible-field-list '("Dnas.*" "Message-Id")
+ "All fields that match this list will be displayed in MIME preview buffer.
+Each elements are regexp of field-name.")
+
(defun mime-view-cut-header ()
(goto-char (point-min))
(while (re-search-forward mime-view-ignored-field-regexp nil t)
("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.
+ "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.")
;;; @@ entity separator
;;;
-(defun mime-view-entity-separator-function (rcnum cinfo
- media-type media-subtype
- params subj)
+(defun mime-view-entity-separator-function (entity-node-id
+ 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 media-type media-subtype)
+ (or (mime-view-header-visible-p entity-node-id cinfo)
+ (mime-view-body-visible-p entity-node-id cinfo media-type media-subtype)
(progn
(goto-char (point-max))
(insert "\n")
;;; @@ buffer local variables
;;;
-;;; @@@ in raw buffer
+;;; @@@ in raw-buffer
;;;
-(defvar mime-raw-content-info
+(defvar mime-raw-message-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)
+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/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-message-info)
-(defvar mime-view-buffer nil
- "MIME View buffer corresponding with the (raw) buffer.")
-(make-variable-buffer-local 'mime-view-buffer)
+(defvar mime-preview-buffer nil
+ "MIME-preview buffer corresponding with the (raw) buffer.")
+(make-variable-buffer-local 'mime-preview-buffer)
-;;; @@@ in view buffer
+;;; @@@ in preview-buffer
;;;
(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
+ "Mother buffer corresponding with the (MIME-preview) buffer.
+If current MIME-preview 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.")
+ "Raw buffer corresponding with the (MIME-preview) buffer.")
(make-variable-buffer-local 'mime-raw-buffer)
-(defvar mime-view-original-major-mode nil
- "Major-mode in mime-raw-buffer.")
-(make-variable-buffer-local 'mime-view-original-major-mode)
+(defvar mime-preview-original-major-mode nil
+ "Major-mode of mime-raw-buffer.")
+(make-variable-buffer-local 'mime-preview-original-major-mode)
-(make-variable-buffer-local 'mime::preview/original-window-configuration)
+(make-variable-buffer-local 'mime-preview-original-window-configuration)
;;; @@ quitting method
;;;
-(defvar mime-view-quitting-method-alist
+(defvar mime-preview-quitting-method-alist
'((mime-show-message-mode
- . mime-view-quitting-method-for-mime-show-message-mode))
+ . mime-preview-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)
(set-buffer ibuf)
))
(or mime-view-redisplay
- (setq mime-raw-content-info (mime-parse-message ctl encoding))
+ (setq mime-raw-message-info (mime-parse-message ctl encoding))
)
- (let* ((cinfo mime-raw-content-info)
- (pcl (mime/flatten-content-info cinfo))
+ (let* ((cinfo mime-raw-message-info)
+ (pcl (mime-raw-flatten-message-info cinfo))
(the-buf (current-buffer))
(mode major-mode)
)
(widen)
(erase-buffer)
(setq mime-raw-buffer the-buf)
- (setq mime-view-original-major-mode mode)
+ (setq mime-preview-original-major-mode mode)
(setq major-mode 'mime-view-mode)
(setq mode-name "MIME-View")
(while pcl
(setq buffer-read-only t)
(set-buffer the-buf)
)
- (setq mime-view-buffer obuf)
+ (setq mime-preview-buffer obuf)
)
(defun mime-view-display-entity (content cinfo ibuf obuf)
)))
(params (mime-entity-info-parameters content))
(encoding (mime-entity-info-encoding content))
- (rcnum (mime-entity-info-rnum content))
+ (entity-node-id (mime-entity-info-node-id content))
he e nb ne subj)
(set-buffer ibuf)
(goto-char beg)
(narrow-to-region beg end)
(setq subj
(eword-decode-string
- (mime-article/get-subject params encoding)))
+ (mime-raw-get-subject params encoding)))
)
(set-buffer obuf)
(setq nb (point))
(narrow-to-region nb nb)
(mime-view-entity-button-function
- rcnum cinfo media-type media-subtype params subj encoding)
- (if (mime-view-header-visible-p rcnum cinfo)
+ entity-node-id cinfo media-type media-subtype params subj encoding)
+ (if (mime-view-header-visible-p entity-node-id cinfo)
(mime-view-display-header beg he)
)
- (if (and (null rcnum)
+ (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
- rcnum cinfo media-type media-subtype params subj encoding)
+ entity-node-id cinfo media-type media-subtype params subj encoding)
))
- (cond ((mime-view-body-visible-p rcnum cinfo media-type media-subtype)
+ (cond ((mime-view-body-visible-p entity-node-id cinfo
+ media-type media-subtype)
(mime-view-display-body he end
- rcnum cinfo ctype params subj encoding)
+ entity-node-id cinfo
+ ctype params subj encoding)
)
((and (eq media-type 'message)(eq media-subtype 'partial))
(mime-view-insert-message/partial-button)
)
- ((and (null rcnum)
+ ((and (null entity-node-id)
(null (mime-entity-info-children cinfo))
)
(goto-char (point-max))
- (mime-view-insert-entity-button
- rcnum cinfo media-type media-subtype params subj encoding)
+ (mime-view-insert-entity-button entity-node-id cinfo
+ media-type media-subtype params
+ subj encoding)
))
(mime-view-entity-separator-function
- rcnum cinfo media-type media-subtype params subj)
+ entity-node-id 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)
+ (put-text-property nb ne 'mime-view-entity-info content)
(goto-char ne)
))
(save-restriction
(narrow-to-region (point)(point))
(insert-buffer-substring mime-raw-buffer beg end)
- (let ((f (cdr (assq mime-view-original-major-mode
+ (let ((f (cdr (assq mime-preview-original-major-mode
mime-view-content-header-filter-alist))))
(if (functionp f)
(funcall f)
(run-hooks 'mime-view-content-header-filter-hook)
))
-(defun mime-view-display-body (beg end rcnum cinfo ctype params subj encoding)
+(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)
(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)
+(defun mime-raw-get-uu-filename (param &optional encoding)
(if (member (or encoding
(cdr (assq 'encoding param))
)
""))
))
-(defun mime-article/get-subject (param &optional encoding)
+(defun mime-raw-get-subject (param &optional encoding)
(or (std11-find-field-body '("Content-Description" "Subject"))
(let (ret)
(if (or (and (setq ret (mime/Content-Disposition))
)
(std11-strip-quoted-string (cdr ret))
))
- (mime-article/get-uu-filename param encoding)
+ (mime-raw-get-uu-filename param encoding)
""))
;;; @ entity information
;;;
-(defun mime-article/point-content-number (p &optional cinfo)
- (or cinfo
- (setq cinfo mime-raw-content-info)
- )
- (let ((b (mime-entity-info-point-min cinfo))
- (e (mime-entity-info-point-max cinfo))
- (c (mime-entity-info-children cinfo))
+(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-info-point-min message-info))
+ (e (mime-entity-info-point-max message-info))
+ (c (mime-entity-info-children message-info))
)
- (if (and (<= b p)(<= p e))
+ (if (and (<= b position)(<= position e))
(or (let (co ret (sn 0))
(catch 'tag
(while c
(setq co (car c))
- (setq ret (mime-article/point-content-number p co))
+ (setq ret (mime-raw-point-to-entity-number position co))
(cond ((eq ret t) (throw 'tag (list sn)))
(ret (throw 'tag (cons sn ret)))
)
)))
t))))
-(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-raw-content-info)
- )
- (if (eq cn t)
- cinfo
- (let ((sn (car cn)))
+(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-entity-node-id-to-entity-info (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)
- cinfo
- (let ((rc (nth sn (mime-entity-info-children cinfo))))
+ message-info
+ (let ((rc (nth sn (mime-entity-info-children message-info))))
(if rc
- (mime-article/cnum-to-cinfo (cdr cn) rc)
+ (mime-raw-entity-number-to-entity-info (cdr entity-number) rc)
))
))))
-(defun mime/flatten-content-info (&optional cinfo)
- (or cinfo
- (setq cinfo mime-raw-content-info)
- )
- (let ((dest (list cinfo))
- (rcl (mime-entity-info-children cinfo))
- )
+(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-info-children message-info)))
(while rcl
- (setq dest (nconc dest (mime/flatten-content-info (car rcl))))
- (setq rcl (cdr rcl))
- )
+ (setq dest (nconc dest (mime-raw-flatten-message-info (car rcl))))
+ (setq rcl (cdr rcl)))
dest))
;;; @@ predicate functions
;;;
-(defun mime-view-header-visible-p (rcnum cinfo)
+(defvar mime-view-childrens-header-showing-Content-Type-list
+ '("message/rfc822" "message/news"))
+
+(defun mime-view-header-visible-p (entity-node-id cinfo)
"Return non-nil if header of current entity is visible."
- (or (null rcnum)
+ (or (null entity-node-id)
(member (mime-entity-info-type/subtype
- (mime-article/rcnum-to-cinfo (cdr rcnum) cinfo))
+ (mime-raw-entity-node-id-to-entity-info
+ (cdr entity-node-id) cinfo))
mime-view-childrens-header-showing-Content-Type-list)
))
-(defun mime-view-body-visible-p (rcnum cinfo media-type media-subtype)
+(defun mime-view-body-visible-p (entity-node-id cinfo
+ media-type media-subtype)
(let ((ctype (if media-type
(if media-subtype
(format "%s/%s" media-type media-subtype)
(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)))
+ (let ((ccinfo
+ (mime-raw-entity-node-id-to-entity-info
+ entity-node-id cinfo)))
(member (mime-entity-info-encoding ccinfo)
'(nil "7bit" "8bit"))
)
(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-preview-display-x-face)
)
"Menu for MIME Viewer")
(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))
+ "\C-c\C-x" (function mime-preview-kill-buffer))
;; (define-key mime-view-mode-map
;; "<" (function beginning-of-buffer))
;; (define-key mime-view-mode-map
(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)
)
(prog1
(switch-to-buffer ret)
- (setq mime::preview/original-window-configuration win-conf)
+ (setq mime-preview-original-window-configuration win-conf)
(if mother
(progn
(setq mime-mother-buffer mother)
))
(mime-view-define-keymap default-keymap-or-function)
- (let ((point (next-single-property-change (point-min) 'mime-view-cinfo)))
+ (let ((point (next-single-property-change (point-min) 'mime-view-entity-info)))
(if point
(goto-char point)
(goto-char (point-min))
;;; @@ 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")
)
;;; @@ following
;;;
-(defun mime-view-get-original-major-mode ()
+(defun mime-preview-original-major-mode ()
"Return major-mode of original buffer.
If a current buffer has mime-mother-buffer, return original major-mode
of the mother-buffer."
(if mime-mother-buffer
(save-excursion
(set-buffer mime-mother-buffer)
- (mime-view-get-original-major-mode)
+ (mime-preview-original-major-mode)
)
- mime-view-original-major-mode))
+ mime-preview-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'."
(interactive)
- (let ((root-cinfo (get-text-property (point-min) 'mime-view-cinfo))
+ (let ((root-cinfo (get-text-property (point-min) 'mime-view-entity-info))
cinfo)
- (while (null (setq cinfo (get-text-property (point) 'mime-view-cinfo)))
+ (while (null (setq cinfo
+ (get-text-property (point) 'mime-view-entity-info)))
(backward-char)
)
- (let* ((p-beg (previous-single-property-change (point) 'mime-view-cinfo))
+ (let* ((p-beg
+ (previous-single-property-change (point) 'mime-view-entity-info))
p-end
- (rcnum (mime-entity-info-rnum cinfo))
- (len (length rcnum))
+ (entity-node-id (mime-entity-info-node-id cinfo))
+ (len (length entity-node-id))
)
(cond ((null p-beg)
(setq p-beg
(if (eq (next-single-property-change (point-min)
- 'mime-view-cinfo)
+ 'mime-view-entity-info)
(point))
(point)
(point-min)))
)
- ((eq (next-single-property-change p-beg 'mime-view-cinfo)
+ ((eq (next-single-property-change p-beg 'mime-view-entity-info)
(point))
(setq p-beg (point))
))
- (setq p-end (next-single-property-change p-beg 'mime-view-cinfo))
+ (setq p-end (next-single-property-change p-beg 'mime-view-entity-info))
(cond ((null p-end)
(setq p-end (point-max))
)
- ((null rcnum)
+ ((null entity-node-id)
(setq p-end (point-max))
)
(t
(let (e)
(while (setq e
(next-single-property-change
- (point) 'mime-view-cinfo))
+ (point) 'mime-view-entity-info))
(goto-char e)
- (let ((rc (mime-entity-info-rnum
+ (let ((rc (mime-entity-info-node-id
(get-text-property (point)
- 'mime-view-cinfo))))
- (or (equal rcnum (nthcdr (- (length rc) len) rc))
+ 'mime-view-entity-info))))
+ (or (equal entity-node-id
+ (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)))
+ (let* ((mode (mime-preview-original-major-mode))
+ (new-name
+ (format "%s-%s" (buffer-name) (reverse entity-node-id)))
new-buf
(the-buf (current-buffer))
(a-buf mime-raw-buffer)
(erase-buffer)
(insert-buffer-substring the-buf p-beg p-end)
(goto-char (point-min))
- (if (mime-view-header-visible-p rcnum root-cinfo)
+ (if (mime-view-header-visible-p entity-node-id root-cinfo)
(delete-region (goto-char (point-min))
(if (re-search-forward "^$" nil t)
(match-end 0)
(goto-char (point-min))
(insert "\n")
(goto-char (point-min))
- (let ((rcnum (mime-entity-info-rnum cinfo)) ci str)
+ (let ((entity-node-id (mime-entity-info-node-id 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)
- ":") ""))))
+ (setq
+ str
+ (save-excursion
+ (set-buffer a-buf)
+ (setq
+ ci
+ (mime-raw-entity-node-id-to-entity-info
+ entity-node-id))
+ (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))
(if str
(insert str)
)
- rcnum))
+ entity-node-id))
(setq fields (std11-collect-field-names)
- rcnum (cdr rcnum))
+ entity-node-id (cdr entity-node-id))
)
)
(let ((rest mime-view-following-required-fields-list))
;;; @@ X-Face
;;;
-(defun mime-view-display-x-face ()
+(defun mime-preview-display-x-face ()
(interactive)
(save-window-excursion
(set-buffer mime-raw-buffer)
;;; @@ 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)))
+ (while (null (setq cinfo
+ (get-text-property (point) 'mime-view-entity-info)))
(backward-char)
)
- (let ((r (mime-article/rcnum-to-cinfo
- (cdr (mime-entity-info-rnum cinfo))
- (get-text-property 1 'mime-view-cinfo)))
+ (let ((r (mime-raw-entity-node-id-to-entity-info
+ (cdr (mime-entity-info-node-id cinfo))
+ (get-text-property 1 'mime-view-entity-info)))
point)
(catch 'tag
(while (setq point (previous-single-property-change
- (point) 'mime-view-cinfo))
+ (point) 'mime-view-entity-info))
(goto-char point)
- (if (eq r (get-text-property (point) 'mime-view-cinfo))
+ (if (eq r (get-text-property (point) 'mime-view-entity-info))
(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'."
(interactive)
- (while (null (get-text-property (point) 'mime-view-cinfo))
+ (while (null (get-text-property (point) 'mime-view-entity-info))
(backward-char)
)
- (let ((point (previous-single-property-change (point) 'mime-view-cinfo)))
+ (let ((point
+ (previous-single-property-change (point) 'mime-view-entity-info)))
(if point
(goto-char point)
- (let ((f (assq mime-view-original-major-mode
+ (let ((f (assq mime-preview-original-major-mode
mime-view-over-to-previous-method-alist)))
(if f
(funcall (cdr f))
))
)))
-(defun mime-view-move-to-next ()
+(defun mime-preview-move-to-next ()
"Move to next entity.
If there is no previous entity, it calls function registered in
variable `mime-view-over-to-next-method-alist'."
(interactive)
- (let ((point (next-single-property-change (point) 'mime-view-cinfo)))
+ (let ((point (next-single-property-change (point) 'mime-view-entity-info)))
(if point
(goto-char point)
- (let ((f (assq mime-view-original-major-mode
+ (let ((f (assq mime-preview-original-major-mode
mime-view-over-to-next-method-alist)))
(if f
(funcall (cdr f))
))
)))
-(defun mime-view-scroll-up-entity (&optional h)
+(defun mime-preview-scroll-up-entity (&optional h)
"Scroll up current entity.
If reached to (point-max), it calls function registered in variable
`mime-view-over-to-next-method-alist'."
(setq h (1- (window-height)))
)
(if (= (point) (point-max))
- (let ((f (assq mime-view-original-major-mode
+ (let ((f (assq mime-preview-original-major-mode
mime-view-over-to-next-method-alist)))
(if f
(funcall (cdr f))
))
(let ((point
- (or (next-single-property-change (point) 'mime-view-cinfo)
+ (or (next-single-property-change (point) 'mime-view-entity-info)
(point-max))))
(forward-line h)
(if (> (point) point)
)
)))
-(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'."
(setq h (1- (window-height)))
)
(if (= (point) (point-min))
- (let ((f (assq mime-view-original-major-mode
+ (let ((f (assq mime-preview-original-major-mode
mime-view-over-to-previous-method-alist)))
(if f
(funcall (cdr f))
(while (> (point) 1)
(if (setq point
(previous-single-property-change (point)
- 'mime-view-cinfo))
+ 'mime-view-entity-info))
(throw 'tag t)
)
(backward-char)
(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 ()
- "Quit from MIME-View buffer.
+(defun mime-preview-quit ()
+ "Quit from MIME-preview buffer.
It calls function registered in variable
-`mime-view-quitting-method-alist'."
+`mime-preview-quitting-method-alist'."
(interactive)
- (let ((r (assq mime-view-original-major-mode
- mime-view-quitting-method-alist)))
+ (let ((r (assq mime-preview-original-major-mode
+ mime-preview-quitting-method-alist)))
(if r
(funcall (cdr r))
)))
-(defun mime-view-show-summary ()
+(defun mime-preview-show-summary ()
"Show summary.
It calls function registered in variable
`mime-view-show-summary-method'."
(interactive)
- (let ((r (assq mime-view-original-major-mode
+ (let ((r (assq mime-preview-original-major-mode
mime-view-show-summary-method)))
(if r
(funcall (cdr r))
)))
-(defun mime-view-kill-buffer ()
+(defun mime-preview-kill-buffer ()
(interactive)
(kill-buffer (current-buffer))
)
projects / elisp / semi.git / blobdiff