*** /home/albinus/src/tramp/lisp/tramp.el.~2.676.~	2009-02-26 15:38:23.000000000 +0100
--- /home/albinus/src/tramp/lisp/tramp.el	2009-03-15 11:33:02.000000000 +0100
***************
*** 1002,1009 ****
  			"Sorry, try again."
  			"Name or service not known"
  			"Host key verification failed."
! 			"No supported authentication methods left to try!"
! 			"Tramp connection closed") t)
  	  ".*"
  	  "\\|"
  	  "^.*\\("
--- 1002,1008 ----
  			"Sorry, try again."
  			"Name or service not known"
  			"Host key verification failed."
! 			"No supported authentication methods left to try!") t)
  	  ".*"
  	  "\\|"
  	  "^.*\\("
***************
*** 6462,6469 ****
  		     (or (tramp-get-connection-property vec "process-name" nil)
  			 (tramp-buffer-name vec))
  		     (tramp-get-connection-buffer vec)
! 		     tramp-encoding-shell)))
! 	       (first-hop t))
  
  	  (tramp-message
  	   vec 6 "%s" (mapconcat 'identity (process-command p) " "))
--- 6461,6467 ----
  		     (or (tramp-get-connection-property vec "process-name" nil)
  			 (tramp-buffer-name vec))
  		     (tramp-get-connection-buffer vec)
! 		     tramp-encoding-shell))))
  
  	  (tramp-message
  	   vec 6 "%s" (mapconcat 'identity (process-command p) " "))
***************
*** 6537,6553 ****
  		    (setq x (mapcar '(lambda (y) (format-spec y spec)) x))
  		    (unless (member "" x) (mapconcat 'identity x " ")))
  		 login-args " ")
- 		;; String to detect failed connection.  Every single
- 		;; word must be enclosed with '\"'; otherwise it is
- 		;; detected during connection setup.
  		;; Local shell could be a Windows COMSPEC.  It doesn't
  		;; know the ";" syntax, but we must exit always for
  		;; `start-process'.  "exec" does not work either.
! 		(if first-hop
! 		    " && exit || exit"
! 		  "; echo \"Tramp\" \"connection\" \"closed\"; sleep 1"))
! 	       ;; We don't reach a Windows shell.  Could be initial only.
! 	       first-hop nil)
  
  	      ;; Send the command.
  	      (tramp-message vec 3 "Sending command `%s'" command)
--- 6535,6544 ----
  		    (setq x (mapcar '(lambda (y) (format-spec y spec)) x))
  		    (unless (member "" x) (mapconcat 'identity x " ")))
  		 login-args " ")
  		;; Local shell could be a Windows COMSPEC.  It doesn't
  		;; know the ";" syntax, but we must exit always for
  		;; `start-process'.  "exec" does not work either.
! 		" && exit || exit"))
  
  	      ;; Send the command.
  	      (tramp-message vec 3 "Sending command `%s'" command)