[Emacs-diffs] Changes to emacs/lisp/net/tramp.el,v

[Michael Albinus]

CVSROOT:        /sources/emacs
Module name:    emacs
Changes by:     Michael Albinus <albinus>       07/11/05 20:52:29

Index: net/tramp.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/net/tramp.el,v
retrieving revision 1.154
retrieving revision 1.155
diff -u -b -r1.154 -r1.155
--- net/tramp.el        31 Oct 2007 20:04:42 -0000      1.154
+++ net/tramp.el        5 Nov 2007 20:52:29 -0000       1.155
@@ -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))