From fa62ca865041b75ceea33652eab54f325b049f4a Mon Sep 17 00:00:00 2001 From: Michael Albinus Date: Mon, 30 Dec 2024 12:42:00 +0100 Subject: [PATCH] ; Minor Tramp changes * lisp/net/tramp.el (tramp-handle-make-process): * lisp/net/tramp-adb.el (tramp-adb-handle-make-process): * lisp/net/tramp-androidsu.el (tramp-androidsu-handle-make-process): * lisp/net/tramp-sh.el (tramp-sh-handle-make-process): * lisp/net/tramp-smb.el (tramp-smb-handle-start-file-process): Don't use connection property "remote-command", it's superfluous. * lisp/net/tramp-archive.el (tramp-archive-local-file-name): Add `tramp-archive-method' to `tramp-methods' temporarily. (cherry picked from commit 7671d50b149edd9e19c29f5fa8ee71c01e2f583d) --- lisp/net/tramp-adb.el | 2 -- lisp/net/tramp-androidsu.el | 1 - lisp/net/tramp-archive.el | 3 ++- lisp/net/tramp-sh.el | 2 -- lisp/net/tramp-smb.el | 4 +--- lisp/net/tramp.el | 1 - 6 files changed, 3 insertions(+), 10 deletions(-) diff --git a/lisp/net/tramp-adb.el b/lisp/net/tramp-adb.el index 2e9df00668b..6724db3eecf 100644 --- a/lisp/net/tramp-adb.el +++ b/lisp/net/tramp-adb.el @@ -846,8 +846,6 @@ will be used." (when filter (set-process-filter p filter)) (process-put p 'remote-command orig-command) - (tramp-set-connection-property - p "remote-command" orig-command) ;; Set query flag and process marker for this ;; process. We ignore errors, because the ;; process could have finished already. diff --git a/lisp/net/tramp-androidsu.el b/lisp/net/tramp-androidsu.el index 9e99838f751..c6b8f865ad9 100644 --- a/lisp/net/tramp-androidsu.el +++ b/lisp/net/tramp-androidsu.el @@ -375,7 +375,6 @@ FUNCTION." ;; so we reset it. (set-process-query-on-exit-flag p (null noquery)) (process-put p 'remote-command orig-command) - (tramp-set-connection-property p "remote-command" orig-command) (when (bufferp stderr) (tramp-taint-remote-process-buffer stderr)) p))) diff --git a/lisp/net/tramp-archive.el b/lisp/net/tramp-archive.el index f77dcec3663..f3996900aee 100644 --- a/lisp/net/tramp-archive.el +++ b/lisp/net/tramp-archive.el @@ -585,7 +585,8 @@ offered." ;; This is used in GNU ELPA package tramp-locproc.el. (defun tramp-archive-local-file-name (filename) "Return local mount name of FILENAME." - (tramp-gvfs-local-file-name (tramp-archive-gvfs-file-name filename))) + (let ((tramp-methods (cons `(,tramp-archive-method) tramp-methods))) + (tramp-gvfs-local-file-name (tramp-archive-gvfs-file-name filename)))) ;; File name primitives. diff --git a/lisp/net/tramp-sh.el b/lisp/net/tramp-sh.el index fb41cfdf32e..6973f2f99d9 100644 --- a/lisp/net/tramp-sh.el +++ b/lisp/net/tramp-sh.el @@ -3159,8 +3159,6 @@ will be used." (when filter (set-process-filter p filter)) (process-put p 'remote-command orig-command) - (tramp-set-connection-property - p "remote-command" orig-command) ;; Set query flag and process marker for this ;; process. We ignore errors, because the ;; process could have finished already. diff --git a/lisp/net/tramp-smb.el b/lisp/net/tramp-smb.el index c138600be67..0e48bbaf867 100644 --- a/lisp/net/tramp-smb.el +++ b/lisp/net/tramp-smb.el @@ -1476,9 +1476,7 @@ PRESERVE-UID-GID and PRESERVE-EXTENDED-ATTRIBUTES are completely ignored." (tramp-send-string v command))) (setq p (tramp-get-connection-process v)) (when program - (process-put p 'remote-command (cons program args)) - (tramp-set-connection-property - p "remote-command" (cons program args))) + (process-put p 'remote-command (cons program args))) ;; Return value. p))) diff --git a/lisp/net/tramp.el b/lisp/net/tramp.el index 93c6aaa8d55..62197022c45 100644 --- a/lisp/net/tramp.el +++ b/lisp/net/tramp.el @@ -5289,7 +5289,6 @@ should be set connection-local.") ;; so we reset it. (set-process-query-on-exit-flag p (null noquery)) (process-put p 'remote-command orig-command) - (tramp-set-connection-property p "remote-command" orig-command) (when (bufferp stderr) (tramp-taint-remote-process-buffer stderr)) -- 2.39.5