;; Created: 1994/7/13
;; Renamed: 1994/8/31 from tm-body.el
;; Renamed: 1997/02/19 from tm-view.el
-;; Version: $Revision: 0.106 $
+;; Version: $Revision: 0.112 $
;; Keywords: MIME, multimedia, mail, news
;; This file is part of SEMI (SEMI is Emacs MIME Interfaces).
;;;
(defconst mime-view-RCS-ID
- "$Id: mime-view.el,v 0.106 1997-09-05 11:55:10 morioka Exp $")
+ "$Id: mime-view.el,v 0.112 1997-09-05 16:56:00 morioka Exp $")
(defconst mime-view-version
`,(get-version-string mime-view-RCS-ID))
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-entity-info-type/subtype
- (setq ccinfo (mime-article/rcnum-to-cinfo rcnum cinfo))
- ))
- )
+(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 (string-equal ctype "application/octet-stream")
- (progn
- (or ccinfo
- (setq ccinfo (mime-article/rcnum-to-cinfo rcnum cinfo))
- )
+ (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"))
)
;;; @@ 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."
(mime-insert-button
(let ((access-type (assoc "access-type" 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 ")"))
- )
- ">")))
+ "")
+ (if encoding
+ (concat " (" encoding ")")
+ ""))))
(if (>= (+ (current-column)(length rest))(window-width))
"\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-entity-info-type/subtype
- (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)
))
;;; @@ 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")
"Display entity from content-info CONTENT."
(let* ((beg (mime-entity-info-point-min content))
(end (mime-entity-info-point-max content))
- (ctype (mime-entity-info-type/subtype 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))
(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-view-display-header beg he)
)
(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)
+ (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")
+ ((and (eq media-type 'message)(eq media-subtype 'partial))
(mime-view-insert-message/partial-button)
)
((and (null rcnum)
)
(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)
+ (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)
(concat "^"
(apply (function regexp-or) fields)
":") ""))))
- (if (string= (mime-entity-info-type/subtype ci)
- "message/rfc822")
+ (if (and
+ (eq (mime-entity-info-media-type ci) 'message)
+ (eq (mime-entity-info-media-subtype ci) 'rfc822))
nil
(if str
(insert str)