# HG changeset patch
# User Michael Albinus <michael.albinus@gmx.de>
# Date 1194295949 0
# Node ID 8bf6b9dbfa261a50daf2552ca41830f14c1cf7a6
# Parent  4800f9022c9330e6874cadca9cfaa6710948b0f2
* tramp.el (tramp-wait-for-output): Ignore escape sequences in the
prompt.

diff -r 4800f9022c93 -r 8bf6b9dbfa26 lisp/ChangeLog
--- a/lisp/ChangeLog	Mon Nov 05 15:04:15 2007 +0000
+++ b/lisp/ChangeLog	Mon Nov 05 20:52:29 2007 +0000
@@ -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 -r 4800f9022c93 -r 8bf6b9dbfa26 lisp/net/tramp.el
--- a/lisp/net/tramp.el	Mon Nov 05 15:04:15 2007 +0000
+++ b/lisp/net/tramp.el	Mon Nov 05 20:52:29 2007 +0000
@@ -6197,7 +6197,9 @@
     (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))