andros/emacs-gpu
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Do not expand default method, user, host in remote file name completion

Browse source 
* lisp/net/tramp.el (tramp-completion-handle-file-name-all-completions):
Do not expand default method, user, host.  (Bug#50387)
(tramp-get-completion-methods): `partial-method' can be nil.
This commit is contained in:
Michael Albinus 2021-09-07 14:36:06 +02:00
parent db74a93659
commit d5c6bf9625
1 changed files with 10 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
lisp/net/tramp.el
View file

@ -2821,6 +2821,15 @@ not in completion mode."
"Like `file-name-all-completions' for partial Tramp files."
(let ((fullname
(tramp-drop-volume-letter (expand-file-name filename directory)))
;; When `tramp-syntax' is `simplified', we need a default method.
(tramp-default-method
(and (zerop (length tramp-postfix-method-format))
tramp-default-method))
(tramp-default-method-alist
(and (zerop (length tramp-postfix-method-format))
tramp-default-method-alist))
tramp-default-user tramp-default-user-alist
tramp-default-host tramp-default-host-alist
hop result result1)
;; Suppress hop from completion.
@ -3006,7 +3015,7 @@ remote host and localname (filename on remote host)."
"Return all method completions for PARTIAL-METHOD."
(mapcar
(lambda (method)
(and method (string-prefix-p partial-method method)
(and method (string-prefix-p (or partial-method "") method)
(tramp-completion-make-tramp-file-name method nil nil nil)))
(mapcar #'car tramp-methods)))