From: yamaoka <yamaoka>
Date: Wed, 29 Sep 1999 22:15:47 +0000 (+0000)
Subject: Sync up with semi-1_13.
X-Git-Tag: wemi-1_13_7~5
X-Git-Url: http://git.chise.org/gitweb/?a=commitdiff_plain;h=72b49601d5177172a1b7cecdf4ad36210fcb289e;p=elisp%2Fsemi.git

Sync up with semi-1_13.
---

diff --git a/ChangeLog b/ChangeLog
index ea75225..58904cb 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+1999-09-29  MORIOKA Tomohiko  <tomo@m17n.org>
+
+	* mime-play.el (mime-preview-play-current-entity): Use
+	text-property `mime-view-situation' as the initial value of
+	acting-situation to add major-mode.
+
+1999-09-29  MORIOKA Tomohiko  <tomo@m17n.org>
+
+	* mime-edit.el (mime-content-types): Delete text/x-rot13-47-48 in
+	default definition. [cf. <tm-ja:4904>, <tm-ja:4907>]
+
 1999-09-27  Katsumi Yamaoka   <yamaoka@jpl.org>
 
 	* mime-edit.el (mime-edit-user-agent-value): Include
diff --git a/mime-edit.el b/mime-edit.el
index 2464d6e..81b7613 100644
--- a/mime-edit.el
+++ b/mime-edit.el
@@ -191,7 +191,7 @@ To insert a signature file automatically, call the function
      ("css") ; rfc2318
      ("xml") ; rfc2376
      ("x-latex")
-     ("x-rot13-47-48")
+     ;; ("x-rot13-47-48")
      )
     ("message"
      ("external-body"
diff --git a/mime-play.el b/mime-play.el
index 0840304..b4a03a2 100644
--- a/mime-play.el
+++ b/mime-play.el
@@ -159,7 +159,15 @@ If MODE is specified, play as it.  Default MODE is \"play\"."
   (interactive "P")
   (let ((entity (get-text-property (point) 'mime-view-entity)))
     (if entity
-	(let ((situation (list (cons 'mode (or mode "play")))))
+	(let ((situation
+	       (get-text-property (point) 'mime-view-situation)))
+	  (or mode
+	      (setq mode "play"))
+	  (setq situation 
+		(if (assq 'mode situation)
+		    (put-alist 'mode mode (copy-alist situation))
+		  (cons (cons 'mode mode)
+			situation)))
 	  (if ignore-examples
 	      (setq situation
 		    (cons (cons 'ignore-examples ignore-examples)