From: Michael Albinus <michael.albinus@gmx.de>
Date: Thu, 16 Mar 2023 11:41:13 +0000 (+0100)
Subject: Fix regression in Tramp (bug#62194)
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=0330cff65ae837e93ae4d059acf643734d16386d;p=emacs.git

Fix regression in Tramp (bug#62194)

* lisp/net/tramp.el (tramp-handle-make-process):
* lisp/net/tramp-sh.el (tramp-do-copy-or-rename-file-out-of-band)
(tramp-sh-handle-file-notify-add-watch)
(tramp-maybe-open-connection): Don't set process property
`shared-socket'.  (Bug#62194)
---

diff --git a/lisp/net/tramp-sh.el b/lisp/net/tramp-sh.el
index 882b79b3ee7..2f990af334d 100644
--- a/lisp/net/tramp-sh.el
+++ b/lisp/net/tramp-sh.el
@@ -2427,7 +2427,7 @@ The method used must be an out-of-band method."
 		;; This is neded for ssh or PuTTY based processes, and
 		;; only if the respective options are set.  Perhaps,
 		;; the setting could be more fine-grained.
-		(process-put p 'shared-socket t)
+		;; (process-put p 'shared-socket t)
 		(process-put p 'adjust-window-size-function #'ignore)
 		(set-process-query-on-exit-flag p nil)
 
@@ -3760,7 +3760,7 @@ Fall back to normal file name handler if no Tramp handler exists."
 	;; This is neded for ssh or PuTTY based processes, and only if
 	;; the respective options are set.  Perhaps, the setting could
 	;; be more fine-grained.
-	(process-put p 'shared-socket t)
+	;; (process-put p 'shared-socket t)
 	;; Needed for process filter.
 	(process-put p 'events events)
 	(process-put p 'watch-name localname)
@@ -5124,7 +5124,7 @@ connection if a previous connection has died for some reason."
 		;; This is neded for ssh or PuTTY based processes, and
 		;; only if the respective options are set.  Perhaps,
 		;; the setting could be more fine-grained.
-		(process-put p 'shared-socket t)
+		;; (process-put p 'shared-socket t)
 		(process-put p 'adjust-window-size-function #'ignore)
 		(set-process-query-on-exit-flag p nil)
 		(setq tramp-current-connection (cons vec (current-time)))
diff --git a/lisp/net/tramp.el b/lisp/net/tramp.el
index b6e985db6b1..0c8f8acc07d 100644
--- a/lisp/net/tramp.el
+++ b/lisp/net/tramp.el
@@ -5091,7 +5091,7 @@ substitution.  SPEC-LIST is a list of char/value pairs used for
 	    ;; This is neded for ssh or PuTTY based processes, and
 	    ;; only if the respective options are set.  Perhaps, the
 	    ;; setting could be more fine-grained.
-	    (process-put p 'shared-socket t)
+	    ;; (process-put p 'shared-socket t)
 	    (process-put p 'remote-command orig-command)
 	    (tramp-set-connection-property p "remote-command" orig-command)
 
@@ -5809,6 +5809,7 @@ If the user quits via `C-g', it is propagated up to `tramp-file-name-handler'."
   ;; There could be other processes which use the same socket for
   ;; communication.  This could block the output for the current
   ;; process.  Read such output first.  (Bug#61350)
+  ;; The process property isn't set anymore due to Bug#62194.
   (when-let (((process-get proc 'shared-socket))
 	     (v (process-get proc 'vector)))
     (dolist (p (delq proc (process-list)))