diff options
| author | Chong Yidong | 2010-06-11 10:39:54 -0400 |
|---|---|---|
| committer | Chong Yidong | 2010-06-11 10:39:54 -0400 |
| commit | 6534e58a57f60d338491ca97db605cbb116f0c2f (patch) | |
| tree | 63f39d89c5cdb563c67a5d8a2599c3371296ed87 /lisp | |
| parent | 84d9562f579e56ce7bdf9c14b37ab0fa1f596681 (diff) | |
| download | emacs-6534e58a57f60d338491ca97db605cbb116f0c2f.tar.gz emacs-6534e58a57f60d338491ca97db605cbb116f0c2f.zip | |
Fix for comint-password-prompt-regexp (Bug#6367).
* lisp/comint.el (comint-password-prompt-regexp): Fix 2010-04-10 change
(Bug#6367).
* comint-testsuite.el: New file.
Diffstat (limited to 'lisp')
| -rw-r--r-- | lisp/ChangeLog | 5 | ||||
| -rw-r--r-- | lisp/comint.el | 2 |
2 files changed, 6 insertions, 1 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 9584d1ed753..d94489a20d9 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog | |||
| @@ -1,3 +1,8 @@ | |||
| 1 | 2010-06-11 Chong Yidong <cyd@stupidchicken.com> | ||
| 2 | |||
| 3 | * comint.el (comint-password-prompt-regexp): Fix 2010-04-10 change | ||
| 4 | (Bug#6367). | ||
| 5 | |||
| 1 | 2010-06-11 Stephen Eglen <stephen@gnu.org> | 6 | 2010-06-11 Stephen Eglen <stephen@gnu.org> |
| 2 | 7 | ||
| 3 | * shell.el: Bind `shell-resync-dirs' to M-RET. | 8 | * shell.el: Bind `shell-resync-dirs' to M-RET. |
diff --git a/lisp/comint.el b/lisp/comint.el index fd3cff3b5f9..b097baad189 100644 --- a/lisp/comint.el +++ b/lisp/comint.el | |||
| @@ -340,7 +340,7 @@ This variable is buffer-local." | |||
| 340 | ;; Something called "perforce" uses "Enter password:". | 340 | ;; Something called "perforce" uses "Enter password:". |
| 341 | (defcustom comint-password-prompt-regexp | 341 | (defcustom comint-password-prompt-regexp |
| 342 | (concat | 342 | (concat |
| 343 | "^\\(" | 343 | "\\(" |
| 344 | (regexp-opt | 344 | (regexp-opt |
| 345 | '("Enter" "Enter same" "Old" "old" "New" "new" "'s" "login" | 345 | '("Enter" "Enter same" "Old" "old" "New" "new" "'s" "login" |
| 346 | "Kerberos" "CVS" "UNIX" " SMB" "LDAP" "[sudo]" "Repeat" "Bad")) | 346 | "Kerberos" "CVS" "UNIX" " SMB" "LDAP" "[sudo]" "Repeat" "Bad")) |