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

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

diff --git a/tm-play.el b/tm-play.el
index 01eefef..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.27 1996/09/14 08:53:38 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).
@@ -20,20 +20,15 @@
 ;; General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with this program; see the file COPYING.  If not, write to
-;; the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+;; along with GNU Emacs; see the file COPYING.  If not, write to the
+;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
 ;; Boston, MA 02111-1307, USA.
 
 ;;; Code:
 
 (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)
-
-            
+  
 ;;; @ content decoder
 ;;;
 
@@ -96,6 +91,15 @@
       )
     ))
 
+(defun field-unifier-for-mode (a b)
+  (let ((va (cdr a)))
+    (if (if (consp va)
+           (member (cdr b) va)
+         (equal va (cdr b))
+         )
+       (list nil b nil)
+      )))
+
 (defun mime/get-content-decoding-alist (al)
   (get-unified-alist mime/content-decoding-condition al)
   )
@@ -137,34 +141,7 @@
                          (mime-article/make-method-args cal
                                                         (cdr (cdr method)))
                          ))
-             (let ((process-environment
-                    (let* ((rest process-environment)
-                           (dest (cons nil nil))
-                           (prest dest)
-                           (path nil)
-                           cell)
-                      (while (and (setq cell (car rest))
-                                  (not
-                                   (if (string-match "^PATH=" cell)
-                                       (setq path
-                                             (format
-                                              "PATH=%s:%s"
-                                              mime-viewer/external-progs
-                                              (substring cell (match-end 0))
-                                              )))))
-                        (setcar prest cell)
-                        (setcdr prest (cons nil nil))
-                        (setq rest (cdr rest)
-                              prest (cdr prest))
-                        )
-                      (setcar
-                       prest
-                       (or path
-                           (format "PATH=%s" mime-viewer/external-progs)))
-                      (setcdr prest (cdr rest))
-                      dest)))
-               (apply (function start-process) args)
-               )
+             (apply (function start-process) args)
              (mime-article/show-output-buffer)
              ))
        ))))
@@ -384,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))
@@ -419,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))