comparison lisp/net/tramp.el @ 85841:0c0a9419b0c4

* net/tramp.el (tramp-handle-shell-command): Call `start-file-process' directly. Fix bug in deleting temp file.

85840:d227ffcaa3fe

	      (with-parsed-tramp-file-name default-directory nil
		(list output-buffer (tramp-make-tramp-temp-file v)))
	    output-buffer)))

    (prog1
	;; Run the process.  We cannot use `process-file' and
	;; `start-file-process', because these functions might not
	;; exist in older Emacsen.
	(if (integerp asynchronous)
	    (apply 'tramp-handle-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))))
      ;; There's some output, display it.
      (when (with-current-buffer output-buffer (> (point-max) (point-min)))
	(if (functionp 'display-message-or-buffer)
	    (funcall (symbol-function 'display-message-or-buffer) output-buffer)
	  (pop-to-buffer output-buffer))))))

85841:0c0a9419b0c4

	      (with-parsed-tramp-file-name default-directory nil
		(list output-buffer (tramp-make-tramp-temp-file v)))
	    output-buffer)))

    (prog1
	;; Run the process.
	(if (integerp asynchronous)
	    (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 (cadr buffer)))
      ;; There's some output, display it.
      (when (with-current-buffer output-buffer (> (point-max) (point-min)))
	(if (functionp 'display-message-or-buffer)
	    (funcall (symbol-function 'display-message-or-buffer) output-buffer)
	  (pop-to-buffer output-buffer))))))