* net/tramp.el (tramp-login-prompt-regexp): Expand regexp in order to

cover prompts like "login as:".  Reported by Slawomir Nowaczyk
<slawomir.nowaczyk.847@student.lu.se>.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 7251572ee96ae675308dbeadd2a25da84ad4cd63..f5e4ae88c5797823a403583d1eb35ed4ed9d356a 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,9 @@
+2005-09-18  Michael Albinus  <michael.albinus@gmx.de>
+
+       * net/tramp.el (tramp-login-prompt-regexp): Expand regexp in order
+       to cover prompts like "login as:".  Reported by Slawomir Nowaczyk
+       <slawomir.nowaczyk.847@student.lu.se>.
+
 2005-09-18  Chong Yidong  <cyd@stupidchicken.com>
 
        * image.el (image-load-path): Use symbol `data-directory' instead

diff --git a/lisp/net/tramp.el b/lisp/net/tramp.el
index b8b3fb9068ab351adf3f5b071795458afcb4f463..9c832dd14f93ffd9631d2186c65f78c1a68ea8d1 100644 (file)
--- a/lisp/net/tramp.el
+++ b/lisp/net/tramp.el
@@ -822,9 +822,11 @@ tilde expansion, all directory names starting with `~' will be ignored."
   :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)