* tramp.el (tramp-wait-for-output): Ignore escape sequences in the

prompt.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 382355a05bb9440ecb6d1ab055ce880630efb96a..653c8ab7a1e33c26bbf9ebfc6c4f97a3fda2607b 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2007-11-05  Michael Albinus  <michael.albinus@gmx.de>
+
+       * net/tramp.el (tramp-wait-for-output): Ignore escape sequences in
+       the prompt.
+
 2007-10-05  Chris Moore  <christopher.ian.moore@gmail.com>
 
        * wdired.el (wdired-use-dired-vertical-movement): Doc fix.

diff --git a/lisp/net/tramp.el b/lisp/net/tramp.el
index f28d8b7aec7a9cf92c32c7c7f1fe464a9c0e78bf..8b50e034b477634fbe9462861c4f9c8b00d4ad30 100644 (file)
--- a/lisp/net/tramp.el
+++ b/lisp/net/tramp.el
@@ -6197,7 +6197,9 @@ function waits for output unless NOOUTPUT is set."
     (let ((found
           (tramp-wait-for-regexp
            proc timeout
-           (format "^%s\r?$" (regexp-quote tramp-end-of-output)))))
+           ;; Initially, `tramp-end-of-output' is "$ ".  There might
+           ;; be leading escape sequences, which must be ignored.
+           (format "^[^$\n]*%s\r?$" (regexp-quote tramp-end-of-output)))))
       (if found
          (let (buffer-read-only)
            (goto-char (point-max))