This commit was generated by cvs2svn to compensate for changes in r491,

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

diff --git a/tm-play.el b/tm-play.el
index acbf645..53b7172 100644 (file)
--- a/tm-play.el
+++ b/tm-play.el
@@ -4,7 +4,7 @@
 
 ;; Author: MORIOKA Tomohiko <morioka@jaist.ac.jp>
 ;; Created: 1995/9/26 (separated from tm-view.el)
-;; Version: $Id: tm-play.el,v 7.29 1996/09/23 13:14:07 morioka Exp $
+;; Version: $Id: tm-play.el,v 7.33 1996/12/07 08:26:26 morioka Exp $
 ;; Keywords: mail, news, MIME, multimedia
 
 ;; This file is part of tm (Tools for MIME).
@@ -28,19 +28,6 @@
 
 (require 'tm-view)
 
-(defvar mime-viewer/external-progs "/usr/local/share/tm"
-  "*Directory containing tm external methods.")
-
-(add-to-list 'exec-path mime-viewer/external-progs)
-
-(let ((paths (parse-colon-path (getenv "PATH"))))
-  (or (member mime-viewer/external-progs paths)
-      (setenv "PATH"
-             (mapconcat (function identity)
-                        (append paths (list mime-viewer/external-progs))
-                        path-separator))
-      ))
-
   
 ;;; @ content decoder
 ;;;
@@ -374,13 +361,17 @@
       (progn
        ;;(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)
-         (set-buffer (get-buffer-create "FULL"))
-         (insert-file-contents file)
-         )
+       (select-window (or (get-buffer-window mother)
+                          (get-buffer-window
+                           (save-excursion
+                             (set-buffer mother)
+                             mime::preview/article-buffer))
+                          (get-largest-window)
+                          ))
+       (as-binary-input-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))
@@ -409,12 +400,11 @@
     (if (re-search-forward "^\n" nil t)
        (delete-region (point-min) (match-end 0))
       )
-    (let ((m (assq mode mime-viewer/code-converter-alist)))
-      (if (and m (fboundp (setq m (cdr m))))
-         (funcall m (point-min) (point-max) charset encoding)
-       (mime-viewer/default-code-convert-region (point-min) (point-max)
-                                                charset encoding)
-       ))
+    (let ((m (cdr (or (assq mode mime-viewer/code-converter-alist)
+                     (assq t mime-viewer/code-converter-alist)))))
+      (and (functionp m)
+          (funcall m charset encoding)
+          ))
     (save-excursion
       (set-mark (point-min))
       (goto-char (point-max))