Mercurial > emacs
changeset 85933:8bf6b9dbfa26
* tramp.el (tramp-wait-for-output): Ignore escape sequences in the
prompt.
| author | Michael Albinus <michael.albinus@gmx.de> |
|---|---|
| date | Mon, 05 Nov 2007 20:52:29 +0000 |
| parents | 4800f9022c93 |
| children | 0c8b86e9b028 |
| files | lisp/ChangeLog lisp/net/tramp.el |
| diffstat | 2 files changed, 8 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- 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.
--- 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))