[Emacs-diffs] /srv/bzr/emacs/emacs-23 r100131: Fix bug#7224.

[Glenn Morris]

------------------------------------------------------------
revno: 100131
committer: Glenn Morris <address@hidden>
branch nick: emacs-23
timestamp: Sat 2010-10-23 12:15:44 -0700
message:
  Fix bug#7224.
  
  * lisp/comint.el (comint-password-prompt-regexp): Match "enter the password".
modified:
  lisp/ChangeLog
  lisp/comint.el

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2010-10-22 23:38:34 +0000
+++ b/lisp/ChangeLog    2010-10-23 19:15:44 +0000
@@ -1,3 +1,8 @@
+2010-10-23  Glenn Morris  <address@hidden>
+
+       * comint.el (comint-password-prompt-regexp): Match
+       "enter the password".  (Bug#7224)
+
 2010-10-22  Juanma Barranquero  <address@hidden>
 
        * progmodes/dcl-mode.el (dcl-electric-reindent-regexps):

=== modified file 'lisp/comint.el'
--- a/lisp/comint.el    2010-06-24 06:38:09 +0000
+++ b/lisp/comint.el    2010-10-23 19:15:44 +0000
@@ -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)