[Emacs-diffs] Changes to emacs/lisp/net/tramp.el,v

[Michael Albinus]

CVSROOT:        /sources/emacs
Module name:    emacs
Changes by:     Michael Albinus <albinus>       07/10/31 20:04:43

Index: net/tramp.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/net/tramp.el,v
retrieving revision 1.153
retrieving revision 1.154
diff -u -b -r1.153 -r1.154
--- net/tramp.el        30 Oct 2007 20:27:22 -0000      1.153
+++ net/tramp.el        31 Oct 2007 20:04:42 -0000      1.154
@@ -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)