; Minor Tramp cleanup

* lisp/net/tramp-message.el (tramp-warning): Fix `lwarn' call.

* lisp/net/tramp-sh.el (tramp-sh-handle-make-process): Don't set
connection property "remote-pid", it's unused.

(cherry picked from commit 8184f64ab0025afb0b901b9cae3917e6f722974b)

diff --git a/lisp/net/tramp-message.el b/lisp/net/tramp-message.el
index 3fc93d6d2ff6c5a68807c1530dbd1ef4f1135cb4..5fc37cbdacc61bbaeb6bcf346f67f46a5e5cc7e5 100644 (file)
--- a/lisp/net/tramp-message.el
+++ b/lisp/net/tramp-message.el
@@ -465,7 +465,7 @@ to `tramp-message'."
   (declare (tramp-suppress-trace t))
   (let (signal-hook-function)
     (apply 'tramp-message vec-or-proc 2 fmt-string arguments)
-    (lwarn 'tramp :warning fmt-string arguments)))
+    (apply 'lwarn 'tramp :warning fmt-string arguments)))
 
 (defun tramp-test-message (fmt-string &rest arguments)
   "Emit a Tramp message according `default-directory'."

diff --git a/lisp/net/tramp-sh.el b/lisp/net/tramp-sh.el
index 205b0d6304cc9566679e62f78335206436c411b3..8660eabf24adc1a51f1bfc56049400389706e3b0 100644 (file)
--- a/lisp/net/tramp-sh.el
+++ b/lisp/net/tramp-sh.el
@@ -3113,8 +3113,7 @@ will be used."
                        ;; needed when sending signals remotely.
                        (let ((pid (tramp-send-command-and-read v "echo $$")))
                          (setq p (tramp-get-connection-process v))
-                         (process-put p 'remote-pid pid)
-                         (tramp-set-connection-property p "remote-pid" pid))
+                         (process-put p 'remote-pid pid))
                        (when (memq connection-type '(nil pipe))
                          ;; Disable carriage return to newline
                          ;; translation.  This does not work on