diff options
| author | Matthew Bauer | 2019-05-13 18:39:32 -0400 |
|---|---|---|
| committer | Noam Postavsky | 2019-05-24 07:33:01 -0400 |
| commit | f6d3005069551f3ed5817078a095b868007bf12d (patch) | |
| tree | 90861203a45535f38a8e81c570d4e38f0a6014ff | |
| parent | 8cdb9d9d24be0894ec3adc79f7f4af61e131850e (diff) | |
| download | emacs-f6d3005069551f3ed5817078a095b868007bf12d.tar.gz emacs-f6d3005069551f3ed5817078a095b868007bf12d.zip | |
Add "Enter Auth" prompt handling for OpenVPN (Bug#35724)
* lisp/comint.el (comint-password-prompt-regexp): Allow "Enter Auth"
at the beginning.
| -rw-r--r-- | lisp/comint.el | 5 | ||||
| -rw-r--r-- | test/lisp/comint-tests.el | 1 |
2 files changed, 4 insertions, 2 deletions
diff --git a/lisp/comint.el b/lisp/comint.el index 3939371ab85..b6ed199327e 100644 --- a/lisp/comint.el +++ b/lisp/comint.el | |||
| @@ -349,13 +349,14 @@ This variable is buffer-local." | |||
| 349 | ;; Ubuntu's sudo prompts like `[sudo] password for user:' | 349 | ;; Ubuntu's sudo prompts like `[sudo] password for user:' |
| 350 | ;; Some implementations of passwd use "Password (again)" as the 2nd prompt. | 350 | ;; Some implementations of passwd use "Password (again)" as the 2nd prompt. |
| 351 | ;; Something called "perforce" uses "Enter password:". | 351 | ;; Something called "perforce" uses "Enter password:". |
| 352 | ;; See M-x comint-testsuite--test-comint-password-prompt-regexp. | 352 | ;; OpenVPN prints a prompt like: "Enter Auth Password:". |
| 353 | ;; See ert test `comint-test-password-regexp'. | ||
| 353 | (defcustom comint-password-prompt-regexp | 354 | (defcustom comint-password-prompt-regexp |
| 354 | (concat | 355 | (concat |
| 355 | "\\(^ *\\|" | 356 | "\\(^ *\\|" |
| 356 | (regexp-opt | 357 | (regexp-opt |
| 357 | '("Enter" "enter" "Enter same" "enter same" "Enter the" "enter the" | 358 | '("Enter" "enter" "Enter same" "enter same" "Enter the" "enter the" |
| 358 | "Old" "old" "New" "new" "'s" "login" | 359 | "Enter Auth" "enter auth" "Old" "old" "New" "new" "'s" "login" |
| 359 | "Kerberos" "CVS" "UNIX" " SMB" "LDAP" "PEM" "SUDO" | 360 | "Kerberos" "CVS" "UNIX" " SMB" "LDAP" "PEM" "SUDO" |
| 360 | "[sudo]" "Repeat" "Bad" "Retype") | 361 | "[sudo]" "Repeat" "Bad" "Retype") |
| 361 | t) | 362 | t) |
diff --git a/test/lisp/comint-tests.el b/test/lisp/comint-tests.el index 49e59c526f4..0d2d648bbae 100644 --- a/test/lisp/comint-tests.el +++ b/test/lisp/comint-tests.el | |||
| @@ -39,6 +39,7 @@ | |||
| 39 | "[sudo] user 的密码:" ; localized | 39 | "[sudo] user 的密码:" ; localized |
| 40 | "Password (again):" | 40 | "Password (again):" |
| 41 | "Enter password:" | 41 | "Enter password:" |
| 42 | "Enter Auth Password:" ; OpenVPN (Bug#35724) | ||
| 42 | "Mot de Passe :" ; localized (Bug#29729) | 43 | "Mot de Passe :" ; localized (Bug#29729) |
| 43 | "Passwort:") ; localized | 44 | "Passwort:") ; localized |
| 44 | "List of strings that should match `comint-password-prompt-regexp'.") | 45 | "List of strings that should match `comint-password-prompt-regexp'.") |