*** /usr/local/src/tramp/lisp/tramp.el.~1~	Mon May  5 11:15:23 2008
--- /usr/local/src/tramp/lisp/tramp.el	Wed May 14 17:14:02 2008
***************
*** 851,856 ****
--- 851,859 ----
       (tramp-set-completion-function
        "fcp" tramp-completion-function-alist-ssh)))
  
+ (defconst tramp-echo-mark-marker "_echo"
+   "String mark to be transmitted around shell commands.")
+ 
  (defconst tramp-echo-mark "_echo\b\b\b\b\b"
    "String mark to be transmitted around shell commands.
  Used to separate their echo from the output they produce.  This
***************
*** 5641,5648 ****
  	  (forward-line)
  	  (delete-region begin (point))
  	  (goto-char (point-min)))))
!     ;; No echo to be handled, now we can look for the regexp.
!     (when (not (tramp-get-connection-property proc "check-remote-echo" nil))
        (re-search-forward regexp nil t))))
  
  (defun tramp-wait-for-regexp (proc timeout regexp)
--- 5644,5655 ----
  	  (forward-line)
  	  (delete-region begin (point))
  	  (goto-char (point-min)))))
!     (when (or
! 	   ;; No echo to be handled, now we can look for the regexp.
! 	   (not (tramp-get-connection-property proc "check-remote-echo" nil))
! 	   ;; Sometimes the echo is invisible.
! 	   (not (re-search-forward tramp-echo-mark-marker nil t)))
!       (goto-char (point-min))
        (re-search-forward regexp nil t))))
  
  (defun tramp-wait-for-regexp (proc timeout regexp)