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

diff --git a/lisp/net/tramp-adb.el b/lisp/net/tramp-adb.el
index 2e9df00668b4c76e9faab92f4265664196c69fa5..6724db3eecf568a22a69d3876489091a9adfda06 100644 (file)
--- 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 9e99838f751748b0c1207d19059147ca82b83f2e..c6b8f865ad94aa9f67bdcb3054572226269a500d 100644 (file)
--- 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 f77dcec3663331b891ddbeb6b19149dcc72f9cb7..f3996900aee0553d01759c05f22de6f5c580b112 100644 (file)
--- 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))))
 
 \f
 ;; File name primitives.

diff --git a/lisp/net/tramp-sh.el b/lisp/net/tramp-sh.el
index fb41cfdf32ed41d280010d14a6c0abcd4d5f0725..6973f2f99d9d8288b4c02c9d2596cf95a90cf0a1 100644 (file)
--- 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 c138600be67906c9db907e29b8695408c615332f..0e48bbaf8676d8eec50aeae7cfa4a5d85d4e7f67 100644 (file)
--- 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 93c6aaa8d55ef4e4cd512d01ca85f4567886627b..62197022c45efe6927443bcb3b02c0487555bef0 100644 (file)
--- 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))