aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMiles Bader2000-12-22 16:26:40 +0000
committerMiles Bader2000-12-22 16:26:40 +0000
commit95fa4fd79582445edfd57f55e8a84f7f25df16de (patch)
tree496986c39ddb6014316654bfdb6dd4a9bbb10967
parent4481aa9880e18109f080dca5591962f13e03fe99 (diff)
downloademacs-95fa4fd79582445edfd57f55e8a84f7f25df16de.tar.gz
emacs-95fa4fd79582445edfd57f55e8a84f7f25df16de.zip
From Markus Rost <markus.rost@mathematik.uni-regensburg.de>:
(comint-password-prompt-regexp): Support CVS.
-rw-r--r--lisp/ChangeLog4
-rw-r--r--lisp/comint.el2
2 files changed, 5 insertions, 1 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 7c57c4c428a..b9ea32df462 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,7 @@
12000-12-22 Markus Rost <markus.rost@mathematik.uni-regensburg.de>
2
3 * comint.el (comint-password-prompt-regexp): Support CVS.
4
12000-12-22 Gerd Moellmann <gerd@gnu.org> 52000-12-22 Gerd Moellmann <gerd@gnu.org>
2 6
3 * simple.el (delete-key-deletes-forward-mode): Simplify. Also 7 * simple.el (delete-key-deletes-forward-mode): Simplify. Also
diff --git a/lisp/comint.el b/lisp/comint.el
index 33595103a01..4e6d852fe94 100644
--- a/lisp/comint.el
+++ b/lisp/comint.el
@@ -312,7 +312,7 @@ This variable is buffer-local."
312;; ssh-add prints a prompt like `Enter passphrase: '. 312;; ssh-add prints a prompt like `Enter passphrase: '.
313;; Some implementations of passwd use "Password (again)" as the 2nd prompt. 313;; Some implementations of passwd use "Password (again)" as the 2nd prompt.
314(defcustom comint-password-prompt-regexp 314(defcustom comint-password-prompt-regexp
315 "\\(\\([Oo]ld \\|[Nn]ew \\|Kerberos \\|'s \\|login \\|^\\)\ 315 "\\(\\([Oo]ld \\|[Nn]ew \\|Kerberos \\|'s \\|login \\|CVS \\|^\\)\
316[Pp]assword\\( (again)\\)?\\|pass phrase\\|Enter passphrase\\)\ 316[Pp]assword\\( (again)\\)?\\|pass phrase\\|Enter passphrase\\)\
317\\( for [^@ \t\n]+@[^@ \t\n]+\\)?:\\s *\\'" 317\\( for [^@ \t\n]+@[^@ \t\n]+\\)?:\\s *\\'"
318 "*Regexp matching prompts for passwords in the inferior process. 318 "*Regexp matching prompts for passwords in the inferior process.