From 283a3bb10b1b23f196193f32335b2c304e4140ae Mon Sep 17 00:00:00 2001 From: morioka Date: Wed, 15 Apr 1998 00:50:28 +0000 Subject: [PATCH] Abolish function 'mime-view-body-visible-p and 'mime-view-entity-separator-visible-p. (mime-view-display-entity): Don't use 'mime-view-entity-separator-visible-p. --- mime-view.el | 27 ++++++--------------------- 1 file changed, 6 insertions(+), 21 deletions(-) diff --git a/mime-view.el b/mime-view.el index 82dbe45..4956f48 100644 --- a/mime-view.el +++ b/mime-view.el @@ -430,15 +430,6 @@ Each elements are regexp of field-name.") (body-presentation-method . mime-view-insert-message/partial-button))) -(defun mime-view-body-visible-p (entity message-info) - "Return non-nil if body of ENTITY is visible." - (ctree-match-calist mime-preview-condition - (list* (cons 'type (mime-entity-media-type entity)) - (cons 'subtype (mime-entity-media-subtype entity)) - (cons 'encoding (mime-entity-encoding entity)) - (cons 'major-mode major-mode) - (mime-entity-parameters entity)))) - ;;; @@@ entity filter ;;; @@ -488,15 +479,6 @@ if it is not nil.") )) -;;; @@ entity separator -;;; - -(defun mime-view-entity-separator-visible-p (entity message-info) - "Return non-nil if separator is needed for ENTITY." - (and (not (mime-view-header-visible-p entity message-info)) - (not (mime-view-body-visible-p entity message-info)))) - - ;;; @ acting-condition ;;; @@ -808,9 +790,12 @@ The compressed face will be piped to this command.") ((functionp body-presentation-method) (funcall body-presentation-method situation) )) - (when (mime-view-entity-separator-visible-p entity message-info) - (goto-char (point-max)) - (insert "\n")) + (or header-is-visible + body-presentation-method + (progn + (goto-char (point-max)) + (insert "\n") + )) (setq ne (point-max)) (widen) (put-text-property nb ne 'mime-view-raw-buffer ibuf) -- 1.7.10.4