summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFrancesco Potortì <pot@gnu.org>2002-10-28 10:26:19 +0000
committerFrancesco Potortì <pot@gnu.org>2002-10-28 10:26:19 +0000
commitd01dad0c97f8337660226821b7473b8f32f0194e (patch)
treee8b1888a1484ea72e35d872a88bd9491b5f6c976
parent9e31ab116676b84a1d9a9bc5452da6439a27c2a0 (diff)
downloademacs-d01dad0c97f8337660226821b7473b8f32f0194e.tar.gz
(comint-password-prompt-regexp): Synch with main trunk.
-rw-r--r--lisp/comint.el8
1 files changed, 5 insertions, 3 deletions
diff --git a/lisp/comint.el b/lisp/comint.el
index f28c675f089..710a0b8bdaf 100644
--- a/lisp/comint.el
+++ b/lisp/comint.el
@@ -314,9 +314,11 @@ This variable is buffer-local."
;; ssh-add prints a prompt like `Enter passphrase: '.
;; Some implementations of passwd use "Password (again)" as the 2nd prompt.
(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 *\\'"
+ "\\(\\([Oo]ld \\|[Nn]ew \\|'s \\|login \\|\
+Kerberos \\|CVS \\|UNIX \\| SMB \\|^\\)\
+[Pp]assword\\( (again)\\)?\\|\
+pass phrase\\|\\(Enter\\|Repeat\\) passphrase\\)\
+\\( for [^:]+\\)?:\\s *\\'"
"*Regexp matching prompts for passwords in the inferior process.
This is used by `comint-watch-for-password-prompt'."
:type 'regexp