From: Glenn Morris <rgm@gnu.org>
Date: Sat, 23 Oct 2010 19:15:44 +0000 (-0700)
Subject: Fix bug#7224.
X-Git-Tag: emacs-pretest-23.2.90~49
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=0d0d9424a23a1fd11c96b7aa5bba80c88758ddfa;p=emacs.git

Fix bug#7224.

* lisp/comint.el (comint-password-prompt-regexp): Match "enter the password".
---

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index a09514c658b..c5e4ab903ad 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2010-10-23  Glenn Morris  <rgm@gnu.org>
+
+	* comint.el (comint-password-prompt-regexp): Match
+	"enter the password".  (Bug#7224)
+
 2010-10-22  Juanma Barranquero  <lekktu@gmail.com>
 
 	* progmodes/dcl-mode.el (dcl-electric-reindent-regexps):
diff --git a/lisp/comint.el b/lisp/comint.el
index d5d17357ed1..bb43f47b377 100644
--- a/lisp/comint.el
+++ b/lisp/comint.el
@@ -340,13 +340,14 @@ This variable is buffer-local."
 ;; Some implementations of passwd use "Password (again)" as the 2nd prompt.
 ;; Something called "perforce" uses "Enter password:".
 (defcustom comint-password-prompt-regexp
-  "\\(\\(Enter \\|[Oo]ld \\|[Nn]ew \\|'s \\|login \\|\
+  "\\(\\([Ee]nter \\(?:same \\|the \\)?\\|[Oo]ld \\|[Nn]ew \\|'s \\|login \\|\
 Kerberos \\|CVS \\|UNIX \\| SMB \\|LDAP \\|\\[sudo] \\|^\\)\
 \[Pp]assword\\( (again)\\)?\\|\
 pass phrase\\|\\(Enter \\|Repeat \\|Bad \\)?[Pp]assphrase\\)\
 \\(?:, try again\\)?\\(?: for [^:]+\\)?:\\s *\\'"
   "Regexp matching prompts for passwords in the inferior process.
 This is used by `comint-watch-for-password-prompt'."
+  :version "23.3"
   :type 'regexp
   :group 'comint)