procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Tramp cleanup

Browse source 
* doc/misc/tramp.texi (Password handling): Fix typos.

* lisp/net/tramp-docker.el (tramp-default-remote-shell):
* lisp/net/tramp-sshfs.el (tramp-default-remote-shell): Declare.

* lisp/net/tramp.el (tramp-methods): Fix docstring.
(tramp-get-remote-tmpdir): Revert previous patch, it isn't needed
anymore.
This commit is contained in:
Michael Albinus 2022-10-01 21:56:41 +02:00
parent 9f1aec5055
commit be85d2d920
4 changed files with 14 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
doc/misc/tramp.texi
View file

@ -2000,10 +2000,10 @@ password of the target user. If these connections happen on the local
host, an entry with the local user and local host is used:
@example
machine @var{HOST} port sudo login @var{USER} password secret
machine @var{host} port sudo login @var{user} password secret
@end example
@var{USER} and @var{HOST} are the strings returned by
@var{user} and @var{host} are the strings returned by
@code{(user-login-name)} and @code{(system-name)}. If one of these
methods is connected via a multi hop (@pxref{Multi-hops}), the
credentials of the previous hop are used.

3
lisp/net/tramp-docker.el
View file

@ -73,6 +73,9 @@ see its function help for a description of the format."
lines)))
(mapcar (lambda (m) (list nil m)) (delq nil names))))
;;;###tramp-autoload
(defvar tramp-default-remote-shell) ;; Silence byte compiler.
;;;###tramp-autoload
(tramp--with-startup
(push `(,tramp-docker-method

3
lisp/net/tramp-sshfs.el
View file

@ -46,6 +46,9 @@
:version "28.1"
:type 'string)
;;;###tramp-autoload
(defvar tramp-default-remote-shell) ;; Silence byte compiler.
;;;###tramp-autoload
(tramp--with-startup
(add-to-list 'tramp-methods

15
lisp/net/tramp.el
View file

@ -205,9 +205,9 @@ pair of the form (KEY VALUE). The following KEYs are defined:
MUST be a Bourne-like shell. It is normally not necessary to
set this to any value other than \"/bin/sh\": Tramp wants to
use a shell which groks tilde expansion, but it can search
for it. Also note that \"/bin/sh\" exists on all Unixen,
this might not be true for the value that you decide to use.
You Have Been Warned.
for it. Also note that \"/bin/sh\" exists on all Unixen
except Andtoid, this might not be true for the value that you
decide to use. You Have Been Warned.
* `tramp-remote-shell-login'
This specifies the arguments to let `tramp-remote-shell' run
@ -278,7 +278,8 @@ pair of the form (KEY VALUE). The following KEYs are defined:
* `tramp-direct-async'
Whether the method supports direct asynchronous processes.
Until now, just \"ssh\"-based and \"adb\"-based methods do.
Until now, just \"ssh\"-based, \"sshfs\"-based and
\"adb\"-based methods do.
* `tramp-copy-program'
This specifies the name of the program to use for remotely copying
@ -2876,6 +2877,7 @@ remote file names."
(put #'tramp-completion-file-name-handler 'operations
(mapcar #'car tramp-completion-file-name-handler-alist))
;; Integrated in Emacs 27.
(when (bound-and-true-p tramp-archive-enabled)
(add-to-list 'file-name-handler-alist
(cons tramp-archive-file-name-regexp
@ -6124,11 +6126,6 @@ This handles also chrooted environments, which are not regarded as local."
(defun tramp-get-remote-tmpdir (vec)
"Return directory for temporary files on the remote host identified by VEC."
(with-tramp-connection-property (tramp-get-process vec) "remote-tmpdir"
;; Prior Tramp 2.5.3.2, the connection property "tmpdir" did exist
;; with a remote file name. This must be discarded. (Bug#57800)
(when-let ((tmpdir (tramp-get-connection-property vec "tmpdir" nil)))
(when (tramp-tramp-file-p tmpdir)
(tramp-flush-connection-property vec "tmpdir")))
(let ((dir
(tramp-make-tramp-file-name
vec (or (tramp-get-method-parameter vec 'tramp-tmpdir) "/tmp"))))