tm 7.34.

[elisp/tm.git] / tm-play.el

diff --git a/tm-play.el b/tm-play.el
index 51fcbcb..1df7786 100644 (file)
--- a/tm-play.el
+++ b/tm-play.el
@@ -8,7 +8,7 @@
 ;;; Maintainer: MORIOKA Tomohiko <morioka@jaist.ac.jp>
 ;;; Created: 1995/9/26 (separated from tm-view.el)
 ;;; Version:
-;;;    $Id: tm-play.el,v 7.4 1995/12/06 12:45:52 morioka Exp $
+;;;    $Id: tm-play.el,v 7.10 1995/12/14 15:37:13 morioka Exp $
 ;;; Keywords: mail, news, MIME, multimedia
 ;;;
 ;;; This file is part of tm (Tools for MIME).
@@ -39,7 +39,7 @@
 
 (defun mime-preview/decode-content ()
   (interactive)
-  (let ((pc (mime::point-preview-content (point))))
+  (let ((pc (mime-preview/point-pcinfo (point))))
     (if pc
        (let ((the-buf (current-buffer)))
          (setq mime-preview/after-decoded-position (point))
@@ -149,6 +149,7 @@
          format))
 
 (defun mime-article/show-output-buffer (&rest forms)
+  (get-buffer-create mime/output-buffer-name)
   (let ((the-win (selected-window))
        (win (get-buffer-window mime/output-buffer-name))
        )
@@ -211,6 +212,9 @@
         (cur-buf (current-buffer))
         (new-name (format "%s-%s" (buffer-name) cnum))
         (mother mime::article/preview-buffer)
+        (code-converter
+         (or (cdr (assq major-mode mime-viewer/code-converter-alist))
+             'mime-viewer/default-code-convert-region))
         str)
     (setq str (buffer-substring beg end))
     (switch-to-buffer new-name)
@@ -221,6 +225,7 @@
        (delete-region (point-min) (match-end 0))
       )
     (setq major-mode 'mime/show-message-mode)
+    (setq mime::article/code-converter code-converter)
     (mime/viewer-mode mother)
     ))
 
@@ -281,10 +286,10 @@
                )
            (write-region (point) (point-max) file)
            )
-         (if (get-buffer "*MIME-temp*")
-             (kill-buffer "*MIME-temp*")
+         (if (get-buffer mime/temp-buffer-name)
+             (kill-buffer mime/temp-buffer-name)
            )
-         (switch-to-buffer "*MIME-temp*")
+         (switch-to-buffer mime/temp-buffer-name)
          (let ((i 1)
                (max (string-to-int total))
                (file-coding-system-for-read (if (boundp 'MULE)
@@ -325,7 +330,8 @@
        (let ((file-coding-system-for-read
               (if (boundp 'MULE) *noconv*))
              kanji-fileio-code)
-         (find-file file)
+         (set-buffer (get-buffer-create "FULL"))
+         (insert-file-contents file)
          )
        (setq major-mode 'mime/show-message-mode)
        (mime/viewer-mode mother)
@@ -343,7 +349,7 @@
         (new-name (format "%s-%s" (buffer-name) cnum))
         (mother mime::article/preview-buffer)
         (charset (cdr (assoc "charset" cal)))
-        (encoding (cdr (assoc "encoding" cal)))
+        (encoding (cdr (assq 'encoding cal)))
         (mode major-mode)
         str)
     (setq str (buffer-substring beg end))