aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGlenn Morris2010-10-23 12:15:44 -0700
committerGlenn Morris2010-10-23 12:15:44 -0700
commit0d0d9424a23a1fd11c96b7aa5bba80c88758ddfa (patch)
treeffeead77a1ee10d1160772c713cf077e910c6b10
parent88dbda519d46ea8902e7f91a6d217387cfe5a2c0 (diff)
downloademacs-0d0d9424a23a1fd11c96b7aa5bba80c88758ddfa.tar.gz
emacs-0d0d9424a23a1fd11c96b7aa5bba80c88758ddfa.zip
Fix bug#7224.
* lisp/comint.el (comint-password-prompt-regexp): Match "enter the password".
-rw-r--r--lisp/ChangeLog5
-rw-r--r--lisp/comint.el3
2 files changed, 7 insertions, 1 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index a09514c658b..c5e4ab903ad 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
12010-10-23 Glenn Morris <rgm@gnu.org>
2
3 * comint.el (comint-password-prompt-regexp): Match
4 "enter the password". (Bug#7224)
5
12010-10-22 Juanma Barranquero <lekktu@gmail.com> 62010-10-22 Juanma Barranquero <lekktu@gmail.com>
2 7
3 * progmodes/dcl-mode.el (dcl-electric-reindent-regexps): 8 * 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."
340;; Some implementations of passwd use "Password (again)" as the 2nd prompt. 340;; Some implementations of passwd use "Password (again)" as the 2nd prompt.
341;; Something called "perforce" uses "Enter password:". 341;; Something called "perforce" uses "Enter password:".
342(defcustom comint-password-prompt-regexp 342(defcustom comint-password-prompt-regexp
343 "\\(\\(Enter \\|[Oo]ld \\|[Nn]ew \\|'s \\|login \\|\ 343 "\\(\\([Ee]nter \\(?:same \\|the \\)?\\|[Oo]ld \\|[Nn]ew \\|'s \\|login \\|\
344Kerberos \\|CVS \\|UNIX \\| SMB \\|LDAP \\|\\[sudo] \\|^\\)\ 344Kerberos \\|CVS \\|UNIX \\| SMB \\|LDAP \\|\\[sudo] \\|^\\)\
345\[Pp]assword\\( (again)\\)?\\|\ 345\[Pp]assword\\( (again)\\)?\\|\
346pass phrase\\|\\(Enter \\|Repeat \\|Bad \\)?[Pp]assphrase\\)\ 346pass phrase\\|\\(Enter \\|Repeat \\|Bad \\)?[Pp]assphrase\\)\
347\\(?:, try again\\)?\\(?: for [^:]+\\)?:\\s *\\'" 347\\(?:, try again\\)?\\(?: for [^:]+\\)?:\\s *\\'"
348 "Regexp matching prompts for passwords in the inferior process. 348 "Regexp matching prompts for passwords in the inferior process.
349This is used by `comint-watch-for-password-prompt'." 349This is used by `comint-watch-for-password-prompt'."
350 :version "23.3"
350 :type 'regexp 351 :type 'regexp
351 :group 'comint) 352 :group 'comint)
352 353