diff options
| author | Michael Albinus <michael.albinus@gmx.de> | 2007-10-31 20:04:42 +0000 |
|---|---|---|
| committer | Michael Albinus <michael.albinus@gmx.de> | 2007-10-31 20:04:42 +0000 |
| commit | 3412f35d0f2902401c096d4dca1deaf3788e544c (patch) | |
| tree | 926845ce4e9bb84cd53c9efebc9f467ad56b6017 /lisp/net | |
| parent | c01b997152fb916ce687577b03898372e0a404b2 (diff) | |
| download | emacs-3412f35d0f2902401c096d4dca1deaf3788e544c.tar.gz emacs-3412f35d0f2902401c096d4dca1deaf3788e544c.tar.bz2 emacs-3412f35d0f2902401c096d4dca1deaf3788e544c.zip | |
* net/tramp.el (tramp-handle-shell-command): Call `start-file-process'
directly. Fix bug in deleting temp file.
Diffstat (limited to 'lisp/net')
| -rw-r--r-- | lisp/net/tramp.el | 15 |
1 files changed, 5 insertions, 10 deletions
diff --git a/lisp/net/tramp.el b/lisp/net/tramp.el index 6008a591e68..f28d8b7aec7 100644 --- a/lisp/net/tramp.el +++ b/lisp/net/tramp.el @@ -3777,19 +3777,14 @@ Lisp error raised when PROGRAM is nil is trapped also, returning 1." output-buffer))) (prog1 - ;; Run the process. We cannot use `process-file' and - ;; `start-file-process', because these functions might not - ;; exist in older Emacsen. + ;; Run the process. (if (integerp asynchronous) - (apply 'tramp-handle-start-file-process - "*Async Shell*" buffer args) - (apply 'process-file - (car args) nil buffer nil (cdr args))) + (apply 'start-file-process "*Async Shell*" buffer args) + (apply 'process-file (car args) nil buffer nil (cdr args))) ;; Insert error messages if they were separated. (when (listp buffer) - (with-current-buffer error-buffer - (insert-file-contents (cadr buffer))) - (delete-file (buffer-file-name (cadr buffer)))) + (with-current-buffer error-buffer (insert-file-contents (cadr buffer))) + (delete-file (cadr buffer))) ;; There's some output, display it. (when (with-current-buffer output-buffer (> (point-max) (point-min))) (if (functionp 'display-message-or-buffer) |