From: morioka Date: Sun, 19 Apr 1998 10:12:50 +0000 (+0000) Subject: Sync up with SEMI 1.2.4 (Arimagawa). X-Git-Tag: wemi-1_2_4~3 X-Git-Url: http://git.chise.org/gitweb/?a=commitdiff_plain;h=056e7e8e2f02e30a0c5728d8a2e77ca4108455e9;p=elisp%2Fsemi.git Sync up with SEMI 1.2.4 (Arimagawa). --- diff --git a/Makefile b/Makefile index 0c8ebb9..bd8be62 100644 --- a/Makefile +++ b/Makefile @@ -2,7 +2,7 @@ # Makefile for WEMI. # -VERSION = 1.2.3 +VERSION = 1.2.4 SHELL = /bin/sh MAKE = make diff --git a/NEWS b/NEWS index 1faf0b2..d082a90 100644 --- a/NEWS +++ b/NEWS @@ -10,6 +10,43 @@ Copyright (C) 1998 Free Software Foundation, Inc. 'mime-view-plain-text-preview-hook was renamed to 'mime-preview-text/plain-hook. +*** Variable + + Variable 'mime-view-childrens-header-showing-Content-Type-list was +abolished. Please use 'mime-preview-condition instead. + +*** API about visible-predicates were abolished + + Following functions were abolished: + + mime-view-header-visible-p (entity message-info) + + mime-view-body-visible-p (entity message-info) + + mime-view-entity-separator-visible-p (entity message-info) + +Please use 'mime-preview-condition instead. + + Function 'mime-view-entity-button-visible-p is not abolished, but it +is obsoleted. + +*** mime-preview-condition + + Following are added as pre-defined keys: + + 'childrens-situation default preview-situation for children + 'message-button to specify to display message-button + nil: default (invisible) + 'visible: visible + 'invisible: invisible + 'entity-button to specify to display entity-button + nil: default (visible) + 'visible: visible + 'invisible: invisible + 'header to specify to display header + nil: default (invisible) + 'visible: visible + 'invisible: invisible ** API diff --git a/mime-view.el b/mime-view.el index caa409d..0647978 100644 --- a/mime-view.el +++ b/mime-view.el @@ -264,17 +264,17 @@ Please redefine this function if you want to change default setting." ;;; @@@ predicate function ;;; -(defvar mime-view-childrens-header-showing-Content-Type-list - '("message/rfc822" "message/news")) - -(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))) - (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) - )) +;; (defvar mime-view-childrens-header-showing-Content-Type-list +;; '("message/rfc822" "message/news")) + +;; (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))) +;; (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 ;;; @@ -387,14 +387,6 @@ Each elements are regexp of field-name.") (body . visible))) (ctree-set-calist-strictly - 'mime-preview-condition '((type . message)(subtype . rfc822) - (childrens-situation (header . visible)))) - -(ctree-set-calist-strictly - 'mime-preview-condition '((type . message)(subtype . news) - (childrens-situation (header . visible)))) - -(ctree-set-calist-strictly 'mime-preview-condition '((body . visible) (body-presentation-method . with-filter) (body-filter . mime-preview-filter-for-text/plain))) @@ -430,6 +422,18 @@ Each elements are regexp of field-name.") (body-presentation-method . mime-view-insert-message/partial-button))) +(ctree-set-calist-strictly + 'mime-preview-condition '((type . message)(subtype . rfc822) + (body-presentation-method . nil) + (childrens-situation (header . visible) + (entity-button . invisible)))) + +(ctree-set-calist-strictly + 'mime-preview-condition '((type . message)(subtype . news) + (body-presentation-method . nil) + (childrens-situation (header . visible) + (entity-button . invisible)))) + ;;; @@@ entity filter ;;; @@ -697,7 +701,7 @@ The compressed face will be piped to this command.") (cdr (assq 'message-button situation))) (body-presentation-method (cdr (assq 'body-presentation-method situation)))) - (when message-button + (when (eq message-button 'visible) (goto-char (point-max)) (mime-view-insert-entity-button message-info message-info subj) ) @@ -752,12 +756,6 @@ The compressed face will be piped to this command.") (eword-decode-string (mime-raw-get-subject params encoding))) ) - (set-buffer obuf) - (setq nb (point)) - (narrow-to-region nb nb) - (if (mime-view-entity-button-visible-p entity message-info) - (mime-view-insert-entity-button entity message-info subj) - ) (let* ((situation (ctree-match-calist mime-preview-condition (list* (cons 'type media-type) @@ -766,10 +764,19 @@ The compressed face will be piped to this command.") (cons 'major-mode major-mode) (append params default-situation)))) + (button-is-invisible + (eq (cdr (assq 'entity-button situation)) 'invisible)) (header-is-visible - (cdr (assq 'header situation))) + (eq (cdr (assq 'header situation)) 'visible)) (body-presentation-method (cdr (assq 'body-presentation-method situation)))) + (set-buffer obuf) + (setq nb (point)) + (narrow-to-region nb nb) + (or button-is-invisible + (if (mime-view-entity-button-visible-p entity message-info) + (mime-view-insert-entity-button entity message-info subj) + )) (if header-is-visible (save-restriction (narrow-to-region (point)(point)) @@ -1133,14 +1140,14 @@ It calls following-method selected from variable (erase-buffer) (insert-buffer-substring the-buf p-beg p-end) (goto-char (point-min)) - (if (mime-view-header-visible-p entity message-info) - (delete-region (goto-char (point-min)) - (if (re-search-forward "^$" nil t) - (match-end 0) - (point-min))) - ) - (goto-char (point-min)) - (insert "\n") + ;; (if (mime-view-header-visible-p entity message-info) + ;; (delete-region (goto-char (point-min)) + ;; (if (re-search-forward "^$" nil t) + ;; (match-end 0) + ;; (point-min))) + ;; ) + ;;(goto-char (point-min)) + ;;(insert "\n") (goto-char (point-min)) (let ((entity-node-id (mime-entity-node-id entity)) ci str) (while (progn diff --git a/semi-def.el b/semi-def.el index f10aace..951da60 100644 --- a/semi-def.el +++ b/semi-def.el @@ -26,7 +26,7 @@ (require 'emu) -(defconst mime-module-version '("WEMI" "Kawasaki" 1 2 3) +(defconst mime-module-version '("WEMI" "Yokohama" 1 2 4) "Implementation name, version name and numbers of MIME-kernel package.") (autoload 'mule-caesar-region "mule-caesar"