tm 7.34.

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

diff --git a/tm-play.el b/tm-play.el
index 7fbe1f0..1df7786 100644 (file)
--- a/tm-play.el
+++ b/tm-play.el
@@ -5,12 +5,29 @@
 ;;; Copyright (C) 1994,1995 MORIOKA Tomohiko
 ;;;
 ;;; Author: MORIOKA Tomohiko <morioka@jaist.ac.jp>
+;;; Maintainer: MORIOKA Tomohiko <morioka@jaist.ac.jp>
+;;; Created: 1995/9/26 (separated from tm-view.el)
 ;;; Version:
-;;;    $Id: tm-play.el,v 7.1 1995/11/10 11:13:32 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).
 ;;;
+;;; This program is free software; you can redistribute it and/or
+;;; modify it under the terms of the GNU General Public License as
+;;; published by the Free Software Foundation; either version 2, or
+;;; (at your option) any later version.
+;;;
+;;; This program is distributed in the hope that it will be useful,
+;;; but WITHOUT ANY WARRANTY; without even the implied warranty of
+;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+;;; General Public License for more details.
+;;;
+;;; You should have received a copy of the GNU General Public License
+;;; along with This program.  If not, write to the Free Software
+;;; Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
+;;;
+;;; Code:
 
 (require 'tm-view)
 
@@ -22,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))
@@ -132,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))
        )
@@ -177,11 +195,13 @@
 ;;;
 
 (defun mime-viewer/quitting-method-for-mime/show-message-mode ()
-  (set-window-configuration mime/show-mode-old-window-configuration)
-  (let ((mother mime::preview/mother-buffer))
+  (let ((mother mime::preview/mother-buffer)
+       (win-conf mime::preview/original-window-configuration)
+       )
     (kill-buffer
      (mime::preview-content-info/buffer (car mime::preview/content-list)))
     (mime-viewer/kill-buffer)
+    (set-window-configuration win-conf)
     (pop-to-buffer mother)
     ;;(goto-char (point-min))
     ;;(mime-viewer/up-content)
@@ -192,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)
@@ -202,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)
     ))
 
@@ -230,7 +254,11 @@
         (total (cdr (assoc "total" cal)))
         (the-buf (current-buffer))
         file
-        (mother mime::article/preview-buffer))
+        (mother mime::article/preview-buffer)
+        (win-conf (save-excursion
+                    (set-buffer mother)
+                    mime::preview/original-window-configuration))
+        )
     (if (not (file-exists-p root-dir))
        (make-directory root-dir)
       )
@@ -258,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)
@@ -279,23 +307,35 @@
                (goto-char (point-max))
                (setq i (1+ i))
                )
-             (delete-other-windows)
-             (write-file (concat root-dir "/FULL"))
-             (setq major-mode 'mime/show-message-mode)
+             ;;(delete-other-windows)
+             (let ((buf (current-buffer)))
+               (write-file (concat root-dir "/FULL"))
+               (set-window-configuration win-conf)
+               (let ((win (get-buffer-window mother)))
+                 (if win
+                     (select-window win)
+                   ))
+               (set-window-buffer (selected-window) buf)
+               ;;(set-window-buffer buf)
+               (setq major-mode 'mime/show-message-mode)
+               )
              (mime/viewer-mode mother)
              (pop-to-buffer (current-buffer))
              ))
          )
       (progn
-       (delete-other-windows)
+       ;;(delete-other-windows)
+       (set-window-configuration win-conf)
+       (select-window (get-buffer-window mother))
        (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)
-       (pop-to-buffer (current-buffer))
+       ;;(pop-to-buffer (current-buffer))
        ))
     ))
 
@@ -308,11 +348,13 @@
         (cur-buf (current-buffer))
         (new-name (format "%s-%s" (buffer-name) cnum))
         (mother mime::article/preview-buffer)
-        (charset (cdr (assoc "charset" params)))
+        (charset (cdr (assoc "charset" cal)))
+        (encoding (cdr (assq 'encoding cal)))
         (mode major-mode)
         str)
     (setq str (buffer-substring beg end))
     (switch-to-buffer new-name)
+    (setq buffer-read-only nil)
     (erase-buffer)
     (insert str)
     (goto-char (point-min))