diff options
| author | Richard M. Stallman | 2007-12-22 16:23:36 +0000 |
|---|---|---|
| committer | Richard M. Stallman | 2007-12-22 16:23:36 +0000 |
| commit | 55a3770f705e4c21a8eef139eb0feec456917314 (patch) | |
| tree | 336b05542c763928975f18376aab4322dcbec433 /lisp | |
| parent | f11e807991c5988c221bb6868a081b2c32d0d234 (diff) | |
| download | emacs-55a3770f705e4c21a8eef139eb0feec456917314.tar.gz emacs-55a3770f705e4c21a8eef139eb0feec456917314.zip | |
(comint-password-prompt-regexp): Match `Enter Password'.
Diffstat (limited to 'lisp')
| -rw-r--r-- | lisp/ChangeLog | 7 | ||||
| -rw-r--r-- | lisp/comint.el | 3 |
2 files changed, 7 insertions, 3 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 8e474a7f0b9..fb6fbe1da23 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog | |||
| @@ -1,3 +1,7 @@ | |||
| 1 | 2007-12-22 Richard Stallman <rms@gnu.org> | ||
| 2 | |||
| 3 | * comint.el (comint-password-prompt-regexp): Match `Enter Password'. | ||
| 4 | |||
| 1 | 2007-12-21 Jason Rumney <jasonr@gnu.org> | 5 | 2007-12-21 Jason Rumney <jasonr@gnu.org> |
| 2 | 6 | ||
| 3 | * find-dired.el (find-name-arg): New custom variable. | 7 | * find-dired.el (find-name-arg): New custom variable. |
| @@ -15,8 +19,7 @@ | |||
| 15 | 19 | ||
| 16 | 2007-12-19 Martin Rudalics <rudalics@gmx.at> | 20 | 2007-12-19 Martin Rudalics <rudalics@gmx.at> |
| 17 | 21 | ||
| 18 | * cus-start.el (all): Use correct group name for members of | 22 | * cus-start.el: Use correct group name for members of mode-line group. |
| 19 | mode-line group. | ||
| 20 | 23 | ||
| 21 | 2007-12-17 Thien-Thi Nguyen <ttn@gnuvola.org> | 24 | 2007-12-17 Thien-Thi Nguyen <ttn@gnuvola.org> |
| 22 | 25 | ||
diff --git a/lisp/comint.el b/lisp/comint.el index ed1f38bf1a1..047cc3b80fb 100644 --- a/lisp/comint.el +++ b/lisp/comint.el | |||
| @@ -336,8 +336,9 @@ This variable is buffer-local." | |||
| 336 | ;; plink prints a prompt like `Passphrase for key "root@GNU.ORG": '. | 336 | ;; plink prints a prompt like `Passphrase for key "root@GNU.ORG": '. |
| 337 | ;; Ubuntu's sudo prompts like `[sudo] password for user:' | 337 | ;; Ubuntu's sudo prompts like `[sudo] password for user:' |
| 338 | ;; Some implementations of passwd use "Password (again)" as the 2nd prompt. | 338 | ;; Some implementations of passwd use "Password (again)" as the 2nd prompt. |
| 339 | ;; Something called "perforce" uses "Enter password:". | ||
| 339 | (defcustom comint-password-prompt-regexp | 340 | (defcustom comint-password-prompt-regexp |
| 340 | "\\(\\([Oo]ld \\|[Nn]ew \\|'s \\|login \\|\ | 341 | "\\(\\(Enter \\|[Oo]ld \\|[Nn]ew \\|'s \\|login \\|\ |
| 341 | Kerberos \\|CVS \\|UNIX \\| SMB \\|LDAP \\|\\[sudo] \\|^\\)\ | 342 | Kerberos \\|CVS \\|UNIX \\| SMB \\|LDAP \\|\\[sudo] \\|^\\)\ |
| 342 | \[Pp]assword\\( (again)\\)?\\|\ | 343 | \[Pp]assword\\( (again)\\)?\\|\ |
| 343 | pass phrase\\|\\(Enter \\|Repeat \\|Bad \\)?[Pp]assphrase\\)\ | 344 | pass phrase\\|\\(Enter \\|Repeat \\|Bad \\)?[Pp]assphrase\\)\ |