From: Michael Albinus <michael.albinus@gmx.de>
Date: Sun, 18 Sep 2005 20:01:57 +0000 (+0000)
Subject: * net/tramp.el (tramp-login-prompt-regexp): Expand regexp in order to
X-Git-Tag: emacs-pretest-22.0.90~7024
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=bc103d0011c559bd6e5667d1702223ee39660142;p=emacs.git

* 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 7251572ee96..f5e4ae88c57 100644
--- 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 b8b3fb9068a..9c832dd14f9 100644
--- 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)