Github/emacs
2
0
Fork 1
mirror of git://git.sv.gnu.org/emacs.git synced 2026-06-14 12:31:25 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'emacs-31' of git.savannah.gnu.org:/srv/git/emacs into emacs-31

Browse source
This commit is contained in:
Eli Zaretskii 2026-06-04 09:37:22 +03:00
commit 95ac082d5b
2 changed files with 8 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
lisp/net/tramp.el
View file

@ -801,19 +801,23 @@ The regexp should match at end of buffer."
(? "/[fingerprint]") ")?" (? "/[fingerprint]") ")?"
(* blank)) (* blank))
"Regular expression matching all yes/no queries which need to be confirmed. "Regular expression matching all yes/no queries which need to be confirmed.
The confirmation should be done with yes or no. The confirmation should be done with \"yes\" or \"no\".
The regexp should match at end of buffer. The regexp should match at end of buffer.
See also `tramp-yn-prompt-regexp'." See also `tramp-yn-prompt-regexp'."
:type 'regexp) :type 'regexp)
(defcustom tramp-yn-prompt-regexp (defcustom tramp-yn-prompt-regexp
(rx (| (: "Store key in cache? (y/n" (* nonl) ")") (rx (| (: "Store key in cache? (y/n" (* nonl) ")")
"Update cached key? (y/n, Return cancels connection)") "Update cached key? (y/n, Return cancels connection)"
;; distrobox.
(: "Error: no such container \"" (+ nonl) "\"\n"
"Create it now, out of image " (+ nonl) "? [Y/n]:"))
(* blank)) (* blank))
"Regular expression matching all y/n queries which need to be confirmed. "Regular expression matching all y/n queries which need to be confirmed.
The confirmation should be done with y or n. The confirmation should be done with \"y\" or \"n\".
The regexp should match at end of buffer. The regexp should match at end of buffer.
See also `tramp-yesno-prompt-regexp'." See also `tramp-yesno-prompt-regexp'."
:version "31.1"
:type 'regexp) :type 'regexp)
;;;###tramp-autoload ;;;###tramp-autoload

1
test/lisp/net/tramp-tests.el
View file

@ -2299,6 +2299,7 @@ being the result.")
(tramp-default-proxies-alist tramp-default-proxies-alist) (tramp-default-proxies-alist tramp-default-proxies-alist)
(tramp-show-ad-hoc-proxies t)) (tramp-show-ad-hoc-proxies t))
(cl-letf* (((symbol-function #'read-string) #'ignore) ; Suppress password. (cl-letf* (((symbol-function #'read-string) #'ignore) ; Suppress password.
((symbol-function #'y-or-n-p) #'ignore) ; distrobox.
((tramp-file-name-host vec) "example.com.invalid")) ((tramp-file-name-host vec) "example.com.invalid"))
(should-error (should-error
(file-exists-p (tramp-make-tramp-file-name vec)) (file-exists-p (tramp-make-tramp-file-name vec))