X-Git-Url: http://git.chise.org/gitweb/?a=blobdiff_plain;f=mime-play.el;h=a7326a0a9cf3af8c1964798984c58b326a61517b;hb=bf765ed3ff2c3d2546f0687131812b307f9bd041;hp=95d93e1ba9e6229b757d34ee71fd6a6aa590b955;hpb=3b45b1ecd32f43405aa1204a5a8e0f0dedc538bc;p=elisp%2Fsemi.git

diff --git a/mime-play.el b/mime-play.el
index 95d93e1..a7326a0 100644
--- a/mime-play.el
+++ b/mime-play.el
@@ -123,27 +123,14 @@ is selected from variable `mime-acting-condition'.  If MODE is
 specified, play as it.  Default MODE is \"play\"."
   (let ((beg (mime-entity-point-min entity-info))
 	(end (mime-entity-point-max entity-info))
-	(c-type (mime-entity-media-type entity-info))
-	(c-subtype (mime-entity-media-subtype entity-info))
-	(params (mime-entity-parameters entity-info))
-	(encoding (mime-entity-encoding entity-info))
-	)
-    (or c-type
-	(setq c-type 'text
-	      c-subtype 'plain))
-    ;; Check for VM
-    (if (< beg (point-min))
-	(setq beg (point-min))
-      )
-    (if (< (point-max) end)
-	(setq end (point-max))
-      )
+	(content-type (mime-entity-content-type entity-info))
+	(encoding (mime-entity-encoding entity-info)))
+    (or content-type
+	(setq content-type (make-mime-content-type 'text 'plain)))
     (let (method cal ret)
-      (setq cal (list* (cons 'type c-type)
-		       (cons 'subtype c-subtype)
+      (setq cal (list* (cons 'major-mode major-mode)
 		       (cons 'encoding encoding)
-		       (cons 'major-mode major-mode)
-		       params))
+		       content-type))
       (if mode
 	  (setq cal (cons (cons 'mode mode) cal))
 	)
@@ -188,38 +175,54 @@ specified, play as it.  Default MODE is \"play\"."
 	    (t
 	     (mime-show-echo-buffer
 	      "No method are specified for %s\n"
-	      (mime-type/subtype-string c-type c-subtype))
-	     ))
-      )
-    ))
+	      (mime-type/subtype-string
+	       (mime-content-type-primary-type content-type)
+	       (mime-content-type-subtype content-type))
+	      )))
+      )))
 
 
 ;;; @ external decoder
 ;;;
 
+(defvar mime-mailcap-method-filename-alist nil)
+
 (defun mime-activate-mailcap-method (start end situation)
   (save-excursion
     (save-restriction
       (narrow-to-region start end)
       (goto-char start)
       (let ((method (cdr (assoc 'method situation)))
-	    (name (mime-raw-get-filename situation)))
+	    (name (expand-file-name (mime-raw-get-filename situation)
+				    mime-temp-directory)))
 	(mime-write-decoded-region (if (re-search-forward "^$" end t)
 				       (1+ (match-end 0))
 				     (point-min))
 				   end name
 				   (cdr (assq 'encoding situation)))
 	(message "External method is starting...")
-	(let ((command
-	       (mailcap-format-command
-		method
-		(cons (cons 'filename name) situation))))
-	  (start-process command mime-echo-buffer-name
-			 shell-file-name shell-command-switch command)
+	(let ((process
+	       (let ((command
+		      (mailcap-format-command
+		       method
+		       (cons (cons 'filename name) situation))))
+		 (start-process command mime-echo-buffer-name
+				shell-file-name shell-command-switch command)
+		 )))
+	  (set-alist 'mime-mailcap-method-filename-alist process name)
+	  (set-process-sentinel process 'mime-mailcap-method-sentinel)
 	  )
-	(mime-show-echo-buffer)
+	;;(mime-show-echo-buffer)
 	))))
 
+(defun mime-mailcap-method-sentinel (process event)
+  (let ((file (cdr (assq process mime-mailcap-method-filename-alist))))
+    (if (file-exists-p file)
+	(delete-file file)
+      ))
+  (remove-alist 'mime-mailcap-method-filename-alist process)
+  (message (format "%s %s" process event)))
+
 (defun mime-activate-external-method (beg end cal)
   (save-excursion
     (save-restriction
@@ -332,11 +335,16 @@ window.")
   (concat (regexp-* mime-view-file-name-char-regexp)
 	  "\\(\\." mime-view-file-name-char-regexp "+\\)*"))
 
-(defun mime-raw-get-original-filename (param &optional encoding)
-  (or (mime-raw-get-uu-filename param encoding)
+(defun mime-raw-get-original-filename (param)
+  (or (if (member (cdr (assq 'encoding param))
+		  mime-view-uuencode-encoding-name-list)
+	  (mime-raw-get-uu-filename))
       (let (ret)
-	(or (if (or (and (setq ret (mime/Content-Disposition))
-			 (setq ret (assoc "filename" (cdr ret)))
+	(or (if (or (and (setq ret (mime-read-Content-Disposition))
+			 (setq ret
+			       (assoc
+				"filename"
+				(mime-content-disposition-parameters ret)))
 			 )
 		    (setq ret (assoc "name" param))
 		    (setq ret (assoc "x-name" param))
@@ -567,7 +575,7 @@ to write."
 ;;;
 
 (defvar mime-raw-dired-function
-  (if mime/use-multi-frame
+  (if (and (>= emacs-major-version 19) window-system)
       (function dired-other-frame)
     (function mime-raw-dired-function-for-one-frame)
     ))