From 801636b3eefc937104482613e10ae3bf4e6a1033 Mon Sep 17 00:00:00 2001 From: morioka Date: Sat, 11 Apr 1998 19:19:17 +0000 Subject: [PATCH] (mime-view-entity-button-visible-p): Omit to check entity is not message. (mime-view-header-visible-p): Omit to check entity is message. (mime-view-setup-buffers): Call 'mime-view-display-message instead of 'mime-view-display-entity. (mime-view-display-message): New function. (mime-view-display-entity): Abolish local variable 'entity-node-id; don't check entity is message or not. --- mime-view.el | 136 +++++++++++++++++++++++++++++++++++++++++++--------------- 1 file changed, 101 insertions(+), 35 deletions(-) diff --git a/mime-view.el b/mime-view.el index 2421303..a5de61e 100644 --- a/mime-view.el +++ b/mime-view.el @@ -192,20 +192,19 @@ If optional argument MESSAGE-INFO is not specified, (defun mime-view-entity-button-visible-p (entity message-info) "Return non-nil if header of ENTITY is visible. Please redefine this function if you want to change default setting." - (and (not (mime-root-entity-p entity)) - (let ((media-type (mime-entity-media-type entity)) - (media-subtype (mime-entity-media-subtype entity))) - (or (not (eq media-type 'application)) - (and (not (eq media-subtype 'x-selection)) - (or (not (eq media-subtype 'octet-stream)) - (let ((mother-entity - (mime-raw-entity-parent entity message-info))) - (or (not (eq (mime-entity-media-type mother-entity) - 'multipart)) - (not (eq (mime-entity-media-subtype mother-entity) - 'encrypted))) - ) - )))))) + (let ((media-type (mime-entity-media-type entity)) + (media-subtype (mime-entity-media-subtype entity))) + (or (not (eq media-type 'application)) + (and (not (eq media-subtype 'x-selection)) + (or (not (eq media-subtype 'octet-stream)) + (let ((mother-entity + (mime-raw-entity-parent entity message-info))) + (or (not (eq (mime-entity-media-type mother-entity) + 'multipart)) + (not (eq (mime-entity-media-subtype mother-entity) + 'encrypted))) + ) + ))))) ;;; @@@ entity button generator ;;; @@ -274,12 +273,11 @@ Please redefine this function if you want to change default setting." (defun mime-view-header-visible-p (entity message-info) "Return non-nil if header of ENTITY is visible." (let ((entity-node-id (mime-entity-node-id entity))) - (or (null entity-node-id) - (member (mime-entity-type/subtype - (mime-raw-find-entity-from-node-id - (cdr entity-node-id) message-info)) - mime-view-childrens-header-showing-Content-Type-list) - ))) + (member (mime-entity-type/subtype + (mime-raw-find-entity-from-node-id + (cdr entity-node-id) message-info)) + mime-view-childrens-header-showing-Content-Type-list) + )) ;;; @@@ entity header filter ;;; @@ -638,7 +636,7 @@ The compressed face will be piped to this command.") (setq mime-preview-original-major-mode mode) (setq major-mode 'mime-view-mode) (setq mode-name "MIME-View") - (mime-view-display-entity message-info message-info the-buf obuf) + (mime-view-display-message message-info the-buf obuf) (set-buffer-modified-p nil) ) (setq buffer-read-only t) @@ -647,8 +645,89 @@ The compressed face will be piped to this command.") (setq mime-preview-buffer obuf) ) +(defun mime-view-display-message (message-info ibuf obuf) + (let* ((start (mime-entity-point-min message-info)) + (end (mime-entity-point-max message-info)) + (media-type (mime-entity-media-type message-info)) + (media-subtype (mime-entity-media-subtype message-info)) + (ctype (if media-type + (if media-subtype + (format "%s/%s" media-type media-subtype) + (symbol-name media-type) + ))) + (params (mime-entity-parameters message-info)) + (encoding (mime-entity-encoding message-info)) + end-of-header e nb ne subj) + (set-buffer ibuf) + (goto-char start) + (setq end-of-header (if (re-search-forward "^$" nil t) + (1+ (match-end 0)) + end)) + (if (> end-of-header end) + (setq end-of-header end) + ) + (save-restriction + (narrow-to-region start end) + (setq subj + (eword-decode-string + (mime-raw-get-subject params encoding))) + ) + (set-buffer obuf) + (setq nb (point)) + (narrow-to-region nb nb) + ;; Insert message-header + (save-restriction + (narrow-to-region (point)(point)) + (insert-buffer-substring mime-raw-buffer start end-of-header) + (let ((f (cdr (assq mime-preview-original-major-mode + mime-view-content-header-filter-alist)))) + (if (functionp f) + (funcall f) + (mime-view-default-content-header-filter) + )) + (run-hooks 'mime-view-content-header-filter-hook) + ) + (if (member ctype mime-view-content-button-visible-ctype-list) + (save-excursion + (goto-char (point-max)) + (mime-view-insert-entity-button message-info message-info subj) + )) + (let* ((situation + (ctree-match-calist mime-preview-condition + (list* (cons 'type media-type) + (cons 'subtype media-subtype) + (cons 'encoding encoding) + (cons 'major-mode major-mode) + params))) + (body-presentation-method + (cdr (assq 'body-presentation-method situation)))) + (cond ((eq body-presentation-method 'with-filter) + (let ((body-filter (cdr (assq 'body-filter situation)))) + (save-restriction + (narrow-to-region (point-max)(point-max)) + (insert-buffer-substring mime-raw-buffer end-of-header end) + (funcall body-filter situation) + ))) + ((functionp body-presentation-method) + (funcall body-presentation-method situation) + ) + ((null (mime-entity-children message-info)) + (goto-char (point-max)) + (mime-view-insert-entity-button message-info message-info subj) + )) + ) + (setq ne (point-max)) + (widen) + (put-text-property nb ne 'mime-view-raw-buffer ibuf) + (put-text-property nb ne 'mime-view-entity message-info) + (goto-char ne) + (let ((children (mime-entity-children message-info))) + (while children + (mime-view-display-entity (car children) message-info ibuf obuf) + (setq children (cdr children)) + )))) + (defun mime-view-display-entity (entity message-info ibuf obuf) - "Display ENTITY." (let* ((start (mime-entity-point-min entity)) (end (mime-entity-point-max entity)) (media-type (mime-entity-media-type entity)) @@ -660,7 +739,6 @@ The compressed face will be piped to this command.") ))) (params (mime-entity-parameters entity)) (encoding (mime-entity-encoding entity)) - (entity-node-id (mime-entity-node-id entity)) end-of-header e nb ne subj) (set-buffer ibuf) (goto-char start) @@ -694,13 +772,6 @@ The compressed face will be piped to this command.") )) (run-hooks 'mime-view-content-header-filter-hook) )) - (if (and (mime-root-entity-p entity) - (member - ctype mime-view-content-button-visible-ctype-list)) - (save-excursion - (goto-char (point-max)) - (mime-view-insert-entity-button entity message-info subj) - )) (let* ((situation (ctree-match-calist mime-preview-condition (list* (cons 'type media-type) @@ -719,11 +790,6 @@ The compressed face will be piped to this command.") ))) ((functionp body-presentation-method) (funcall body-presentation-method situation) - ) - ((and (null entity-node-id) - (null (mime-entity-children message-info))) - (goto-char (point-max)) - (mime-view-insert-entity-button entity message-info subj) )) (when (mime-view-entity-separator-visible-p entity message-info) (goto-char (point-max)) -- 1.7.10.4