[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] /srv/bzr/emacs/trunk r99869: Update comint-password-prompt
From: |
Chong Yidong |
Subject: |
[Emacs-diffs] /srv/bzr/emacs/trunk r99869: Update comint-password-prompt-regexp (Bug#2817). |
Date: |
Sat, 10 Apr 2010 19:54:50 -0400 |
User-agent: |
Bazaar (2.0.3) |
------------------------------------------------------------
revno: 99869
committer: Chong Yidong <address@hidden>
branch nick: trunk
timestamp: Sat 2010-04-10 19:54:50 -0400
message:
Update comint-password-prompt-regexp (Bug#2817).
* comint.el (comint-password-prompt-regexp): Use regexp-opt, and
recognize ssh-keygen prompt (Bug#2817).
modified:
lisp/ChangeLog
lisp/comint.el
=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog 2010-04-10 15:51:46 +0000
+++ b/lisp/ChangeLog 2010-04-10 23:54:50 +0000
@@ -1,3 +1,8 @@
+2010-04-10 Jari Aalto <address@hidden>
+
+ * comint.el (comint-password-prompt-regexp): Use regexp-opt, and
+ recognize ssh-keygen prompt (Bug#2817).
+
2010-04-10 Michael Albinus <address@hidden>
* net/tramp.el (tramp-do-copy-or-rename-file): Add progress reporter.
=== modified file 'lisp/comint.el'
--- a/lisp/comint.el 2010-01-13 08:35:10 +0000
+++ b/lisp/comint.el 2010-04-10 23:54:50 +0000
@@ -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
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] /srv/bzr/emacs/trunk r99869: Update comint-password-prompt-regexp (Bug#2817).,
Chong Yidong <=