diff options
| author | Michael Albinus <michael.albinus@gmx.de> | 2023-02-13 15:51:48 +0100 |
|---|---|---|
| committer | Michael Albinus <michael.albinus@gmx.de> | 2023-02-13 15:51:48 +0100 |
| commit | a3edacd3f547195740304139cb68aaa94d7b18ee (patch) | |
| tree | 07b3ab42d53157d79b7f9ea70e2644619087cf6e /lisp/net/tramp.el | |
| parent | 609319da870eac75cf4715de8abfaac9233d98f9 (diff) | |
| download | emacs-a3edacd3f547195740304139cb68aaa94d7b18ee.tar.gz | |
Add new user option password-colon-equivalents
* lisp/international/mule-conf.el (password-colon-equivalents):
New defcustom.
* lisp/comint.el (comint-password-prompt-regexp):
* lisp/eshell/esh-mode.el (eshell-password-prompt-regexp): Use it.
* lisp/net/tramp-compat.el (tramp-compat-password-colon-equivalents):
New variable.
* lisp/net/tramp.el (tramp-password-prompt-regexp): Use it.
Diffstat (limited to 'lisp/net/tramp.el')
| -rw-r--r-- | lisp/net/tramp.el | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/lisp/net/tramp.el b/lisp/net/tramp.el index 115048d59db..9fa9866aec8 100644 --- a/lisp/net/tramp.el +++ b/lisp/net/tramp.el @@ -641,10 +641,11 @@ This regexp must match both `tramp-initial-end-of-output' and :type 'regexp) (defcustom tramp-password-prompt-regexp - (rx - bol (* nonl) - (group (regexp (regexp-opt password-word-equivalents))) - (* nonl) (any ":：៖") (? "\^@") (* blank)) + (rx-to-string + `(: bol (* nonl) + (group (| . ,password-word-equivalents)) + (* nonl) (any . ,tramp-compat-password-colon-equivalents) + (? "\^@") (* blank))) "Regexp matching password-like prompts. The regexp should match at end of buffer. |