comparison lisp/comint.el @ 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 15e91f601933
children 0f82907d5a26
comparison
equal deleted inserted replaced
111157:d3f1a0178876 111158:b3c93f0bd2ff
338 ;; plink prints a prompt like `Passphrase for key "root@GNU.ORG": '. 338 ;; plink prints a prompt like `Passphrase for key "root@GNU.ORG": '.
339 ;; Ubuntu's sudo prompts like `[sudo] password for user:' 339 ;; Ubuntu's sudo prompts like `[sudo] password for user:'
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 \\|\
344 Kerberos \\|CVS \\|UNIX \\| SMB \\|LDAP \\|\\[sudo] \\|^\\)\ 344 Kerberos \\|CVS \\|UNIX \\| SMB \\|LDAP \\|\\[sudo] \\|^\\)\
345 \[Pp]assword\\( (again)\\)?\\|\ 345 \[Pp]assword\\( (again)\\)?\\|\
346 pass phrase\\|\\(Enter \\|Repeat \\|Bad \\)?[Pp]assphrase\\)\ 346 pass 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.
349 This is used by `comint-watch-for-password-prompt'." 349 This 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
353 ;; Here are the per-interpreter hooks. 354 ;; Here are the per-interpreter hooks.
354 (defvar comint-get-old-input (function comint-get-old-input-default) 355 (defvar comint-get-old-input (function comint-get-old-input-default)