*** /home/albinus/src/tramp/lisp/tramp.el	2006-03-08 22:24:59.000000000 +0100
--- /home/albinus/src/tramp/lisp/tramp.el.~2.478.~	2006-03-08 06:25:47.000000000 +0100
***************
*** 3082,3090 ****
         (mapconcat 'identity (cons copy-program copy-args) " "))
  
        ;; Use rcp-like program for file transfer.
!       (let* ((default-directory (tramp-temporary-file-directory))
! 	     (p (apply 'start-process (buffer-name trampbuf) trampbuf
! 		       copy-program copy-args)))
  	(tramp-set-process-query-on-exit-flag p nil)
  	(tramp-process-actions
  	 p method user host tramp-actions-copy-out-of-band))
--- 3082,3089 ----
         (mapconcat 'identity (cons copy-program copy-args) " "))
  
        ;; Use rcp-like program for file transfer.
!       (let ((p (apply 'start-process (buffer-name trampbuf) trampbuf
! 		      copy-program copy-args)))
  	(tramp-set-process-query-on-exit-flag p nil)
  	(tramp-process-actions
  	 p method user host tramp-actions-copy-out-of-band))
***************
*** 3924,3932 ****
  				 (tramp-temporary-file-directory)))
  			   (and
  			    ;; cksum runs locally
! 			    (let ((default-directory
! 				    (tramp-temporary-file-directory)))
! 			      (zerop (call-process "cksum" tmpfil t)))
  			    ;; cksum runs remotely
  			    (zerop
  			     (tramp-send-command-and-check
--- 3923,3929 ----
  				 (tramp-temporary-file-directory)))
  			   (and
  			    ;; cksum runs locally
! 			    (zerop (call-process "cksum" tmpfil t))
  			    ;; cksum runs remotely
  			    (zerop
  			     (tramp-send-command-and-check
***************
*** 4914,4925 ****
  	     method user host
  	     2 "`touch -t %s %s' failed" touch-time localname)))
        ;; It's a local file.
!       (let ((default-directory (tramp-temporary-file-directory)))
! 	(with-temp-buffer
! 	  (unless
! 	      (zerop (call-process
! 		      "touch" nil (current-buffer) nil "-t" touch-time file))
! 	    (message "`touch -t %s %s' failed" touch-time file)))))))
  
  (defun tramp-buffer-name (method user host)
    "A name for the connection buffer for USER at HOST using METHOD."
--- 4911,4920 ----
  	     method user host
  	     2 "`touch -t %s %s' failed" touch-time localname)))
        ;; It's a local file.
!       (with-temp-buffer
! 	(unless (zerop (call-process
! 			"touch" nil (current-buffer) nil "-t" touch-time file))
! 	  (message "`touch -t %s %s' failed" touch-time file))))))
  
  (defun tramp-buffer-name (method user host)
    "A name for the connection buffer for USER at HOST using METHOD."
***************
*** 5231,5238 ****
  
  (defun tramp-action-out-of-band (p method user host)
    "Check whether an out-of-band copy has finished."
-   (tramp-message 9 "Status: %s Buffer:\n%s"
-    (process-status p) (buffer-string))
    (cond ((and (memq (process-status p) '(stop exit))
  	      (zerop (process-exit-status p)))
  	 (tramp-message 3 "Process has finished.")
--- 5226,5231 ----
***************
*** 5774,5791 ****
  OUTPUT can be a string (which specifies a filename), or t (which
  means standard output and thus the current buffer), or nil (which
  means discard it)."
!   (let ((default-directory (tramp-temporary-file-directory)))
!     (call-process
!      tramp-encoding-shell		;program
!      (when (and input (not (string-match "%s" cmd)))
!        input)				;input
!      (if (eq output t) t nil)		;output
!      nil				;redisplay
!      tramp-encoding-command-switch
!      ;; actual shell command
!      (concat
!       (if (string-match "%s" cmd) (format cmd input) cmd)
!       (if (stringp output) (concat "> " output) "")))))
  
  (defun tramp-maybe-open-connection (method user host)
    "Maybe open a connection to HOST, logging in as USER, using METHOD.
--- 5767,5783 ----
  OUTPUT can be a string (which specifies a filename), or t (which
  means standard output and thus the current buffer), or nil (which
  means discard it)."
!   (call-process
!    tramp-encoding-shell			;program
!    (when (and input (not (string-match "%s" cmd)))
!      input)				;input
!    (if (eq output t) t nil)		;output
!    nil					;redisplay
!    tramp-encoding-command-switch
!    ;; actual shell command
!    (concat
!     (if (string-match "%s" cmd) (format cmd input) cmd)
!     (if (stringp output) (concat "> " output) ""))))
  
  (defun tramp-maybe-open-connection (method user host)
    "Maybe open a connection to HOST, logging in as USER, using METHOD.