Mercurial > emacs
changeset 85841:0c0a9419b0c4
* net/tramp.el (tramp-handle-shell-command): Call `start-file-process'
directly. Fix bug in deleting temp file.
| author | Michael Albinus <michael.albinus@gmx.de> |
|---|---|
| date | Wed, 31 Oct 2007 20:04:42 +0000 |
| parents | d227ffcaa3fe |
| children | 96510b236eb5 |
| files | lisp/ChangeLog lisp/net/tramp.el |
| diffstat | 2 files changed, 10 insertions(+), 10 deletions(-) [+] |
line wrap: on
line diff
--- a/lisp/ChangeLog Wed Oct 31 20:00:36 2007 +0000 +++ b/lisp/ChangeLog Wed Oct 31 20:04:42 2007 +0000 @@ -1,3 +1,8 @@ +2007-10-31 Michael Albinus <michael.albinus@gmx.de> + + * net/tramp.el (tramp-handle-shell-command): Call `start-file-process' + directly. Fix bug in deleting temp file. + 2007-10-31 Stefan Monnier <monnier@iro.umontreal.ca> * progmodes/python.el (python-mode-abbrev-table): Use :regexp.
--- a/lisp/net/tramp.el Wed Oct 31 20:00:36 2007 +0000 +++ b/lisp/net/tramp.el Wed Oct 31 20:04:42 2007 +0000 @@ -3777,19 +3777,14 @@ 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)