aboutsummaryrefslogtreecommitdiffstats
path: root/lisp/net
diff options
context:
space:
mode:
authorMichael Albinus2023-01-30 11:43:04 +0100
committerMichael Albinus2023-01-30 11:43:04 +0100
commit99e40959f4036debe099f144ed2664a38e23563d (patch)
tree1236df0dff4d2fb14fd475f547a536b1547e9980 /lisp/net
parent8360e12f0ea3a3ccf0305adab3c7ea7e38af36c1 (diff)
downloademacs-99e40959f4036debe099f144ed2664a38e23563d.tar.gz
emacs-99e40959f4036debe099f144ed2664a38e23563d.zip
Fix password prompt in Tramp (do not merge)
* lisp/net/tramp.el (tramp-password-prompt-regexp): Allow alternative trailing colons. (Bug#61168)
Diffstat (limited to 'lisp/net')
-rw-r--r--lisp/net/tramp.el4
1 files changed, 2 insertions, 2 deletions
diff --git a/lisp/net/tramp.el b/lisp/net/tramp.el
index 1916d50af03..eaddc36b54a 100644
--- a/lisp/net/tramp.el
+++ b/lisp/net/tramp.el
@@ -643,7 +643,7 @@ This regexp must match both `tramp-initial-end-of-output' and
643 (tramp-compat-rx 643 (tramp-compat-rx
644 bol (* nonl) 644 bol (* nonl)
645 (group (regexp (regexp-opt password-word-equivalents))) 645 (group (regexp (regexp-opt password-word-equivalents)))
646 (* nonl) ":" (? "\^@") (* blank)) 646 (* nonl) (any "::៖") (? "\^@") (* blank))
647 "Regexp matching password-like prompts. 647 "Regexp matching password-like prompts.
648The regexp should match at end of buffer. 648The regexp should match at end of buffer.
649 649
@@ -653,7 +653,7 @@ usually more convenient to add new passphrases to that variable
653instead of altering this variable. 653instead of altering this variable.
654 654
655The `sudo' program appears to insert a `^@' character into the prompt." 655The `sudo' program appears to insert a `^@' character into the prompt."
656 :version "24.4" 656 :version "29.1"
657 :type 'regexp) 657 :type 'regexp)
658 658
659(defcustom tramp-wrong-passwd-regexp 659(defcustom tramp-wrong-passwd-regexp