From: yamaoka <yamaoka>
Date: Thu, 27 May 1999 12:33:05 +0000 (+0000)
Subject: Sync up with the latest semi-1_13.
X-Git-Tag: semi-pgpgpg_18~8
X-Git-Url: http://git.chise.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=39725d24b7906f6cc7b92869604ae1372c8a28a8;p=elisp%2Fsemi.git

Sync up with the latest semi-1_13.
---

diff --git a/ChangeLog b/ChangeLog
index ac2ae19..e48be47 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,15 @@
+1999-05-27  MORIOKA Tomohiko  <tomo@m17n.org>
+
+	* semi-def.el (mime-add-condition): Enter to the calist-package
+	`mime-view' before call a seting function.
+
+	* mime-play.el (mime-play-entity): Enter to the calist-package
+	`mime-view' before call `ctree-find-calist'.
+
+	* mime-view.el (mime-view): New calist-package.
+	(mime-display-entity): Enter to the calist-package `mime-view'
+	before call `ctree-match-calist'.
+
 1999-05-23  MORIOKA Tomohiko  <tomo@m17n.org>
 
 	* mime-edit.el (mime-edit-mime-version-value): Don't use
diff --git a/mime-play.el b/mime-play.el
index 9f9a40f..28dcedb 100644
--- a/mime-play.el
+++ b/mime-play.el
@@ -240,6 +240,7 @@ It decodes the entity to call internal or external method.  The method
 is selected from variable `mime-acting-condition'.  If MODE is
 specified, play as it.  Default MODE is \"play\"."
   (let (method ret)
+    (in-calist-package 'mime-view)
     (setq ret
 	  (mime-delq-null-situation
 	   (ctree-find-calist mime-acting-condition
diff --git a/mime-view.el b/mime-view.el
index 086bd16..2a30e18 100644
--- a/mime-view.el
+++ b/mime-view.el
@@ -368,6 +368,8 @@ Each elements are regexp of field-name.")
 ;;; @@@ predicate function
 ;;;
 
+(in-calist-package 'mime-view)
+
 (defun mime-calist::field-match-method-as-default-rule (calist
 							field-type field-value)
   (let ((s-field (assq field-type calist)))
@@ -738,6 +740,7 @@ MEDIA-TYPE must be (TYPE . SUBTYPE), TYPE or t.  t means default."
 	 e nb ne nhb nbb)
     (set-buffer raw-buffer)
     (goto-char start)
+    (in-calist-package 'mime-view)
     (or situation
 	(setq situation
 	      (or (ctree-match-calist mime-preview-condition
diff --git a/semi-def.el b/semi-def.el
index a000dee..3f43753 100644
--- a/semi-def.el
+++ b/semi-def.el
@@ -236,6 +236,7 @@ If optional argument MODE is 'with-default, CONDITION is added with
 default rule.
 If optional argument FILE is specified, it is loaded when CONDITION is
 activate."
+  (in-calist-package 'mime-view)
   (let ((sym (cdr (assq target-type mime-condition-type-alist))))
     (if sym
 	(let ((func (cdr (or (assq mode mime-condition-mode-alist)