Mercurial > emacs
changeset 107824:ffe32691e3ab
Update comint-password-prompt-regexp (Bug#2817).
* comint.el (comint-password-prompt-regexp): Use regexp-opt, and
recognize ssh-keygen prompt (Bug#2817).
| author | Chong Yidong <cyd@stupidchicken.com> |
|---|---|
| date | Sat, 10 Apr 2010 19:54:50 -0400 |
| parents | 46975e084e0c |
| children | 57e2e94dbe55 de8a1b891175 |
| files | lisp/ChangeLog lisp/comint.el |
| diffstat | 2 files changed, 16 insertions(+), 5 deletions(-) [+] |
line wrap: on
line diff
--- a/lisp/ChangeLog Sat Apr 10 13:38:48 2010 -0700 +++ b/lisp/ChangeLog Sat Apr 10 19:54:50 2010 -0400 @@ -1,3 +1,8 @@ +2010-04-10 Jari Aalto <jari.aalto@cante.net> + + * comint.el (comint-password-prompt-regexp): Use regexp-opt, and + recognize ssh-keygen prompt (Bug#2817). + 2010-04-10 Michael Albinus <michael.albinus@gmx.de> * net/tramp.el (tramp-do-copy-or-rename-file): Add progress reporter.
--- a/lisp/comint.el Sat Apr 10 13:38:48 2010 -0700 +++ b/lisp/comint.el Sat Apr 10 19:54:50 2010 -0400 @@ -340,11 +340,17 @@ ;; 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 \\|\ -Kerberos \\|CVS \\|UNIX \\| SMB \\|LDAP \\|\\[sudo] \\|^\\)\ -\[Pp]assword\\( (again)\\)?\\|\ -pass phrase\\|\\(Enter \\|Repeat \\|Bad \\)?[Pp]assphrase\\)\ -\\(?:, try again\\)?\\(?: for [^:]+\\)?:\\s *\\'" + (concat + "^\\(" + (regexp-opt + '("Enter" "Enter same" "Old" "old" "New" "new" "'s" "login" + "Kerberos" "CVS" "UNIX" " SMB" "LDAP" "[sudo]" "Repeat" "Bad")) + " +\\)?" + (regexp-opt + '("password" "Password" "passphrase" "Passphrase" + "pass phrase" "Pass phrase")) + "\\(?:\\(?:, try\\)? *again\\| (empty for no passphrase)\\| (again)\\)?\ +\\(?: for [^:]+\\)?:\\s *\\'") "Regexp matching prompts for passwords in the inferior process. This is used by `comint-watch-for-password-prompt'." :type 'regexp