From: morioka <morioka>
Date: Mon, 8 Jun 1998 02:25:00 +0000 (+0000)
Subject: (mime-delq-null-situation): New function.
X-Git-Tag: semi-1_5_2~3
X-Git-Url: http://git.chise.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=91f4e70d477926fa36f92f764bdb0933c0546cd9;p=elisp%2Fsemi.git

(mime-delq-null-situation): New function.
(mime-raw-play-entity): Use `mime-delq-null-situation'.
---

diff --git a/mime-play.el b/mime-play.el
index e40578c..af845c1 100644
--- a/mime-play.el
+++ b/mime-play.el
@@ -120,6 +120,16 @@ If MODE is specified, play as it.  Default MODE is \"play\"."
 	      )))
   )
 
+(defsubst mime-delq-null-situation (situations field)
+  (let (dest)
+    (while situations
+      (let ((situation (car situations)))
+	(if (assq field situation)
+	    (setq dest (cons situation dest))
+	  ))
+      (setq situations (cdr situations)))
+    dest))
+
 (defun mime-raw-play-entity (entity-info &optional mode)
   "Play entity specified by ENTITY-INFO.
 It decodes the entity to call internal or external method.  The method
@@ -144,10 +154,14 @@ specified, play as it.  Default MODE is \"play\"."
 					      cal)
 		cal))
       (setq ret
-	    (or (ctree-find-calist mime-acting-condition ret
-				   mime-view-find-every-acting-situation)
-		(ctree-find-calist mime-acting-condition cal
-				   mime-view-find-every-acting-situation)
+	    (or (mime-delq-null-situation
+		 (ctree-find-calist mime-acting-condition ret
+				    mime-view-find-every-acting-situation)
+		 'method)
+		(mime-delq-null-situation
+		 (ctree-find-calist mime-acting-condition cal
+				    mime-view-find-every-acting-situation)
+		 'method)
 		))
       (cond ((cdr ret)
 	     (setq ret (select-menu-alist