2 files changed, 8 insertions, 1 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 382355a05bb..653c8ab7a1e 100644
--- 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 f28d8b7aec7..8b50e034b47 100644
--- 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))