Mercurial > emacs
diff lisp/net/tramp.el @ 90228:fa0da9b57058
Revision: miles@gnu.org--gnu-2005/emacs--unicode--0--patch-82
Merge from emacs--cvs-trunk--0
Patches applied:
* emacs--cvs-trunk--0 (patch 542-553)
- Update from CVS
- Merge from gnus--rel--5.10
* gnus--rel--5.10 (patch 116-121)
- Merge from emacs--cvs-trunk--0
- Update from CVS
author | Miles Bader <miles@gnu.org> |
---|---|
date | Mon, 19 Sep 2005 10:20:33 +0000 |
parents | 10fe5fadaf89 efa862a76bc2 |
children | aa89c814f853 |
line wrap: on
line diff
--- a/lisp/net/tramp.el Sun Sep 11 22:21:01 2005 +0000 +++ b/lisp/net/tramp.el Mon Sep 19 10:20:33 2005 +0000 @@ -822,9 +822,11 @@ :type '(repeat string)) (defcustom tramp-login-prompt-regexp - ".*ogin: *" + ".*ogin\\( .*\\)?: *" "*Regexp matching login-like prompts. -The regexp should match at end of buffer." +The regexp should match at end of buffer. + +Sometimes the prompt is reported to look like \"login as:\"." :group 'tramp :type 'regexp)