From a3c1fc99f7a53005aced7697e730a69664f20e95 Mon Sep 17 00:00:00 2001 From: yamaoka Date: Wed, 28 Jul 1999 12:33:29 +0000 Subject: [PATCH] Sync up with the latest semi-1_13 branch. --- ChangeLog | 14 ++++++++ VERSION | 1 + mime-view.el | 105 ++++++++++++++++++++++++++++++---------------------------- semi-def.el | 2 +- 4 files changed, 70 insertions(+), 52 deletions(-) diff --git a/ChangeLog b/ChangeLog index 9b5ea79..fdefd81 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,17 @@ +1999-07-28 MORIOKA Tomohiko + + * mime-view.el (mime-raw-find-entity-from-point): Deleted. + (mime-raw-buffer): Deleted. + (mime-preview-original-major-mode): Add new optional argument + `point'; refer text-property `mime-view-situation' instead of + using `mime-entity-buffer'. + (mime-raw-point-to-entity-node-id): Deleted. + (mime-raw-point-to-entity-number): Deleted. + (mime-raw-flatten-message-info): Deleted. + (mime-display-entity): Add text-property `mime-view-situation' to + each entity. + + 1999-07-27 MORIOKA Tomohiko * SEMI: Version 1.13.5 (Meih-Dò)-A released. diff --git a/VERSION b/VERSION index a4bf0d8..02e2f71 100644 --- a/VERSION +++ b/VERSION @@ -212,6 +212,7 @@ ;;------------------------------------------------------------------------- 1.13.0 Saigata $(B:T3c(B ; = JR $(B?.1[K\@~(B 1.13.1 Kubiki $(B$/$S$-(B +1.13.2 -DÒike-Ikoinomori-A $(BBgCS$$$3$$$N$b$j(B [etc.] diff --git a/mime-view.el b/mime-view.el index 80ef939..245684c 100644 --- a/mime-view.el +++ b/mime-view.el @@ -82,24 +82,25 @@ major-mode or t. t means default. REPRESENTATION-TYPE must be `binary' or `cooked'.") -(defun mime-raw-find-entity-from-point (point &optional message-info) - "Return entity from POINT in mime-raw-buffer. -If optional argument MESSAGE-INFO is not specified, -`mime-message-structure' is used." - (or message-info - (setq message-info mime-message-structure)) - (if (and (<= (mime-entity-point-min message-info) point) - (<= point (mime-entity-point-max message-info))) - (let ((children (mime-entity-children message-info))) - (catch 'tag - (while children - (let ((ret - (mime-raw-find-entity-from-point point (car children)))) - (if ret - (throw 'tag ret) - )) - (setq children (cdr children))) - message-info)))) +;; (defun mime-raw-find-entity-from-point (point &optional message-info) +;; "Return entity from POINT in mime-raw-buffer. +;; If optional argument MESSAGE-INFO is not specified, +;; `mime-message-structure' is used." +;; (or message-info +;; (setq message-info mime-message-structure)) +;; (if (and (<= (mime-entity-point-min message-info) point) +;; (<= point (mime-entity-point-max message-info))) +;; (let ((children (mime-entity-children message-info))) +;; (catch 'tag +;; (while children +;; (let ((ret +;; (mime-raw-find-entity-from-point point (car children)))) +;; (if ret +;; (throw 'tag ret) +;; )) +;; (setq children (cdr children))) +;; message-info)))) +;; (make-obsolete 'mime-raw-find-entity-from-point "don't use it.") ;;; @ in preview-buffer (presentation space) @@ -111,15 +112,15 @@ 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-preview) buffer.") -(make-variable-buffer-local 'mime-raw-buffer) +;; (defvar mime-raw-buffer nil +;; "Raw buffer corresponding with the (MIME-preview) buffer.") +;; (make-variable-buffer-local 'mime-raw-buffer) (defvar mime-preview-original-window-configuration nil "Window-configuration before mime-view-mode is called.") (make-variable-buffer-local 'mime-preview-original-window-configuration) -(defun mime-preview-original-major-mode (&optional recursive) +(defun mime-preview-original-major-mode (&optional recursive point) "Return major-mode of original buffer. If optional argument RECURSIVE is non-nil and current buffer has mime-mother-buffer, it returns original major-mode of the @@ -129,11 +130,8 @@ mother-buffer." (set-buffer mime-mother-buffer) (mime-preview-original-major-mode recursive) ) - (save-excursion - (set-buffer - (mime-entity-buffer - (get-text-property (point-min) 'mime-view-entity))) - major-mode))) + (cdr (assq 'original-major-mode + (get-text-property (or point (point)) 'mime-view-situation))))) ;;; @ entity information @@ -228,30 +226,34 @@ mother-buffer." "")) -(defsubst mime-raw-point-to-entity-node-id (point &optional message-info) - "Return entity-node-id from POINT in mime-raw-buffer. -If optional argument MESSAGE-INFO is not specified, -`mime-message-structure' is used." - (mime-entity-node-id (mime-raw-find-entity-from-point point message-info))) - -(defsubst mime-raw-point-to-entity-number (point &optional message-info) - "Return entity-number from POINT in mime-raw-buffer. -If optional argument MESSAGE-INFO is not specified, -`mime-message-structure' is used." - (mime-entity-number (mime-raw-find-entity-from-point point message-info))) - -(defun mime-raw-flatten-message-info (&optional message-info) - "Return list of entity in mime-raw-buffer. -If optional argument MESSAGE-INFO is not specified, -`mime-message-structure' is used." - (or message-info - (setq message-info mime-message-structure)) - (let ((dest (list message-info)) - (rcl (mime-entity-children message-info))) - (while rcl - (setq dest (nconc dest (mime-raw-flatten-message-info (car rcl)))) - (setq rcl (cdr rcl))) - dest)) +;; (defsubst mime-raw-point-to-entity-node-id (point &optional message-info) +;; "Return entity-node-id from POINT in mime-raw-buffer. +;; If optional argument MESSAGE-INFO is not specified, +;; `mime-message-structure' is used." +;; (mime-entity-node-id (mime-raw-find-entity-from-point point message-info))) + +;; (make-obsolete 'mime-raw-point-to-entity-node-id "don't use it.") + +;; (defsubst mime-raw-point-to-entity-number (point &optional message-info) +;; "Return entity-number from POINT in mime-raw-buffer. +;; If optional argument MESSAGE-INFO is not specified, +;; `mime-message-structure' is used." +;; (mime-entity-number (mime-raw-find-entity-from-point point message-info))) + +;; (make-obsolete 'mime-raw-point-to-entity-number "don't use it.") + +;; (defun mime-raw-flatten-message-info (&optional message-info) +;; "Return list of entity in mime-raw-buffer. +;; If optional argument MESSAGE-INFO is not specified, +;; `mime-message-structure' is used." +;; (or message-info +;; (setq message-info mime-message-structure)) +;; (let ((dest (list message-info)) +;; (rcl (mime-entity-children message-info))) +;; (while rcl +;; (setq dest (nconc dest (mime-raw-flatten-message-info (car rcl)))) +;; (setq rcl (cdr rcl))) +;; dest)) ;;; @ presentation of preview @@ -805,6 +807,7 @@ MEDIA-TYPE must be (TYPE . SUBTYPE), TYPE or t. t means default." (setq ne (point-max)) (widen) (put-text-property nb ne 'mime-view-entity entity) + (put-text-property nb ne 'mime-view-situation situation) (put-text-property nbb ne 'mime-view-entity-body entity) (goto-char ne) (if children diff --git a/semi-def.el b/semi-def.el index 0c5e78d..4292f0c 100644 --- a/semi-def.el +++ b/semi-def.el @@ -30,7 +30,7 @@ (require 'custom) -(defconst mime-user-interface-product ["SEMI" (1 13 5) "Meihò"] +(defconst mime-user-interface-product ["REMI" (1 13 2) "Òike-Ikoinomori"] "Product name, version number and code name of MIME-kernel package.") (autoload 'mule-caesar-region "mule-caesar" -- 1.7.10.4