(comint-password-prompt-regexp): Make it less restrictive, letting

comint recognise OpenSSH2 passphrase prompts.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index c57c4d0b4c03e38d6e5c3b0232c4dcf14162a3c5..98f1fd8a07cb2378fd0b3702f6fdd12c221ad329 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2001-10-17  Francesco Potorti`  <pot@gnu.org>
+
+       * comint.el (comint-password-prompt-regexp): Make it less
+       restrictive, letting comint recognise OpenSSH2 passphrase prompts.
+
 2001-10-15  John Wiegley  <johnw@gnu.org>
 
        * eshell/em-unix.el (eshell/cat): Do a quick test if something is

diff --git a/lisp/comint.el b/lisp/comint.el
index 4be70c63dfa09b84c5b7725e79681b9739e58388..d3b6cd0bef0df161b04e1f1d174ffc611eb3b2cb 100644 (file)
--- a/lisp/comint.el
+++ b/lisp/comint.el
@@ -316,7 +316,7 @@ This variable is buffer-local."
 (defcustom comint-password-prompt-regexp
   "\\(\\([Oo]ld \\|[Nn]ew \\|Kerberos \\|'s \\|login \\|CVS \\|^\\)\
 [Pp]assword\\( (again)\\)?\\|pass phrase\\|Enter passphrase\\)\
-\\( for [^@ \t\n]+@[^@ \t\n]+\\)?:\\s *\\'"
+\\( for [^:]+\\)?:\\s *\\'"
   "*Regexp matching prompts for passwords in the inferior process.
 This is used by `comint-watch-for-password-prompt'."
   :type 'regexp