; 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.

6 files changed, 3 insertions, 10 deletions

diff --git a/lisp/net/tramp-adb.el b/lisp/net/tramp-adb.el
index 7fbb2332e89..27570645b60 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 9b45b416ff9..2dde7094c27 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 7b82195ed68..32f39070971 100644
--- a/lisp/net/tramp-sh.el
+++ b/lisp/net/tramp-sh.el
@@ -3150,8 +3150,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 8d090a6969f..87702d90665 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 03e12471176..ea44a61be19 100644
--- a/lisp/net/tramp.el
+++ b/lisp/net/tramp.el
@@ -5294,7 +5294,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))