From: yamaoka <yamaoka>
Date: Fri, 30 Jul 1999 02:16:22 +0000 (+0000)
Subject: Sync up with the latest semi-1_13 branch.
X-Git-Tag: semi-pgpgpg_20~28
X-Git-Url: http://git.chise.org/gitweb/?a=commitdiff_plain;h=2d6815498c15cd57432a750e9894e88ffc2c08f5;p=elisp%2Fsemi.git

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

diff --git a/ChangeLog b/ChangeLog
index 8fc1b9f..1765c02 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,16 @@
+1999-07-30  Katsumi Yamaoka   <yamaoka@jpl.org>
+
+	* mime-pgp.el (mime-view-application/pgp): Don't set the values of
+	`mime-raw-buffer' and `mime-mother-buffer' in the preview buffer.
+
+1999-07-29  MORIOKA Tomohiko  <tomo@m17n.org>
+
+	* mime-play.el (mime-play-entity): Get media-type from situation
+	instead of entity; display prompt and call `mime-save-content' if
+	method is not found.
+	(mime-detect-content): Call `mime-play-entity' even if media-type
+	specification is not found in `mime-magic-type-alist'.
+
 1999-07-28  Katsumi Yamaoka   <yamaoka@jpl.org>
 
 	* mime-pgp.el (mime-add-application/pgp-keys): Decode the entity
diff --git a/VERSION b/VERSION
index 02e2f71..4bb062d 100644
--- a/VERSION
+++ b/VERSION
@@ -212,7 +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
+1.13.2	-DÒike-Ikoinomori-A		$(BBgCS$$$3$$$N?9(B
 
 
 [etc.]
diff --git a/mime-play.el b/mime-play.el
index 0e213c0..f5a53bf 100644
--- a/mime-play.el
+++ b/mime-play.el
@@ -326,7 +326,11 @@ specified, play as it.  Default MODE is \"play\"."
           ;;  )
 	  (t
 	   (mime-show-echo-buffer "No method are specified for %s\n"
-				  (mime-entity-type/subtype entity))
+				  (mime-type/subtype-string
+				   (cdr (assq 'type situation))
+				   (cdr (assq 'subtype situation))))
+	   (if (y-or-n-p "Do you want to save current entity to disk?")
+	       (mime-save-content entity situation))
 	   ))
     ))
 
@@ -513,16 +517,14 @@ SUBTYPE is symbol to indicate subtype of media-type.")
 			  )
 		      t)))
 	(setq rest (cdr rest))))
-    (if type
-	(mime-play-entity
-	 entity
-	 (put-alist 'type type
-		    (put-alist 'subtype subtype
-			       (del-alist 'method
-					  (copy-alist situation))))
-	 'mime-detect-content)
-      ))
-  )
+    (setq situation (del-alist 'method (copy-alist situation)))
+    (mime-play-entity entity
+		      (if type
+			  (put-alist 'type type
+				     (put-alist 'subtype subtype
+						situation))
+			situation)
+		      'mime-detect-content)))
 
 
 ;;; @ mail/news message