diff options
| author | Glenn Morris | 2007-10-25 03:53:10 +0000 |
|---|---|---|
| committer | Glenn Morris | 2007-10-25 03:53:10 +0000 |
| commit | d8e27e33f6597feca9a02073ce480e9abc182e66 (patch) | |
| tree | f2b1b0760f9e9d3cf9bef86fff60082cd9fe76d7 | |
| parent | fd045a341b7046b5ae0826512d93a4c0e59f882b (diff) | |
| download | emacs-d8e27e33f6597feca9a02073ce480e9abc182e66.tar.gz emacs-d8e27e33f6597feca9a02073ce480e9abc182e66.zip | |
Chris Moore <christopher.ian.moore at gmail.com>
(comint-password-prompt-regexp): Handle `[sudo] password'-style prompt.
| -rw-r--r-- | lisp/comint.el | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/lisp/comint.el b/lisp/comint.el index 623eef17327..f1d9243cc60 100644 --- a/lisp/comint.el +++ b/lisp/comint.el | |||
| @@ -334,10 +334,11 @@ This variable is buffer-local." | |||
| 334 | ;; ksu prints a prompt like `Kerberos password for devnull/root@GNU.ORG: '. | 334 | ;; ksu prints a prompt like `Kerberos password for devnull/root@GNU.ORG: '. |
| 335 | ;; ssh-add prints a prompt like `Enter passphrase: '. | 335 | ;; ssh-add prints a prompt like `Enter passphrase: '. |
| 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 | ;; Some implementations of passwd use "Password (again)" as the 2nd prompt. | 338 | ;; Some implementations of passwd use "Password (again)" as the 2nd prompt. |
| 338 | (defcustom comint-password-prompt-regexp | 339 | (defcustom comint-password-prompt-regexp |
| 339 | "\\(\\([Oo]ld \\|[Nn]ew \\|'s \\|login \\|\ | 340 | "\\(\\([Oo]ld \\|[Nn]ew \\|'s \\|login \\|\ |
| 340 | Kerberos \\|CVS \\|UNIX \\| SMB \\|LDAP \\|^\\)\ | 341 | Kerberos \\|CVS \\|UNIX \\| SMB \\|LDAP \\|\\[sudo] \\|^\\)\ |
| 341 | \[Pp]assword\\( (again)\\)?\\|\ | 342 | \[Pp]assword\\( (again)\\)?\\|\ |
| 342 | pass phrase\\|\\(Enter \\|Repeat \\|Bad \\)?[Pp]assphrase\\)\ | 343 | pass phrase\\|\\(Enter \\|Repeat \\|Bad \\)?[Pp]assphrase\\)\ |
| 343 | \\(?:, try again\\)?\\(?: for [^:]+\\)?:\\s *\\'" | 344 | \\(?:, try again\\)?\\(?: for [^:]+\\)?:\\s *\\'" |