changeset 111158:b3c93f0bd2ff

Fix bug#7224. * lisp/comint.el (comint-password-prompt-regexp): Match "enter the password".
author Glenn Morris <rgm@gnu.org>
date Sat, 23 Oct 2010 12:15:44 -0700
parents d3f1a0178876
children 89ed069d5e26
files lisp/ChangeLog lisp/comint.el
diffstat 2 files changed, 7 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/lisp/ChangeLog	Sat Oct 23 01:38:34 2010 +0200
+++ b/lisp/ChangeLog	Sat Oct 23 12:15:44 2010 -0700
@@ -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):
--- a/lisp/comint.el	Sat Oct 23 01:38:34 2010 +0200
+++ b/lisp/comint.el	Sat Oct 23 12:15:44 2010 -0700
@@ -340,13 +340,14 @@
 ;; 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)