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

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

diff --git a/tm-play.el b/tm-play.el
index 9d6e8f5..7d0e768 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.14 1996/02/05 05:00:27 morioka Exp $
+;;;    $Id: tm-play.el,v 7.20 1996/07/15 14:04:46 morioka Exp $
 ;;; Keywords: mail, news, MIME, multimedia
 ;;;
 ;;; This file is part of tm (Tools for MIME).
@@ -31,7 +31,12 @@
 
 (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
 ;;;
 
@@ -127,6 +132,7 @@
                )
              (goto-char b)
              (write-region b end file)
+             (message "External method is starting...")
              (setq cal (put-alist
                         'name (replace-as-filename name) cal))
              (setq cal (put-alist 'file file cal))
@@ -137,7 +143,34 @@
                          (mime-article/make-method-args cal
                                                         (cdr (cdr method)))
                          ))
-             (apply (function start-process) args)
+             (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)
+               )
              (mime-article/show-output-buffer)
              ))
        ))))
@@ -164,8 +197,13 @@
   (let ((the-win (selected-window))
        (win (get-buffer-window mime/output-buffer-name))
        )
-    (if (null win)
-       (progn
+    (or win
+       (if (and mime/output-buffer-window-is-shared-with-bbdb
+                (boundp 'bbdb-buffer-name)
+                (setq win (get-buffer-window bbdb-buffer-name))
+                )
+           (set-window-buffer win mime/output-buffer-name)
+         (select-window (get-buffer-window mime::article/preview-buffer))
          (setq win (split-window-vertically (/ (* (window-height) 3) 4)))
          (set-window-buffer win mime/output-buffer-name)
          ))