diff options
Diffstat (limited to 'lisp')
| -rw-r--r-- | lisp/ChangeLog | 5 | ||||
| -rw-r--r-- | lisp/net/tramp.el | 15 |
2 files changed, 10 insertions, 10 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 54b5c2a2ba4..4761b65d99d 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -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. 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) |