From: Chong Yidong Date: Sat, 10 Apr 2010 23:54:50 +0000 (-0400) Subject: Update comint-password-prompt-regexp (Bug#2817). X-Git-Tag: emacs-pretest-24.0.90~104^2~275^2~438^2~545 X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=3acb4c9315578a26d878907a61da8487246ef470;p=emacs.git Update comint-password-prompt-regexp (Bug#2817). * comint.el (comint-password-prompt-regexp): Use regexp-opt, and recognize ssh-keygen prompt (Bug#2817). --- diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 102ae6c37fe..8bf9dcd4607 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,8 @@ +2010-04-10 Jari Aalto + + * comint.el (comint-password-prompt-regexp): Use regexp-opt, and + recognize ssh-keygen prompt (Bug#2817). + 2010-04-10 Michael Albinus * net/tramp.el (tramp-do-copy-or-rename-file): Add progress reporter. diff --git a/lisp/comint.el b/lisp/comint.el index f66cdf1bb9d..8defc3c7800 100644 --- a/lisp/comint.el +++ b/lisp/comint.el @@ -340,11 +340,17 @@ This variable is buffer-local." ;; 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