emacs-diffs
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

master c8aad8c: Revert last change in tramp-maybe-open-connection)


From: Michael Albinus
Subject: master c8aad8c: Revert last change in tramp-maybe-open-connection)
Date: Tue, 15 Dec 2020 06:51:01 -0500 (EST)

branch: master
commit c8aad8cc11ccfda64a07cfc9675c6e6b07d552fa
Author: Michael Albinus <michael.albinus@gmx.de>
Commit: Michael Albinus <michael.albinus@gmx.de>

    Revert last change in tramp-maybe-open-connection)
    
    * lisp/net/tramp-sh.el (tramp-maybe-open-connection): Revert last change,
    it causes trouble.
---
 lisp/net/tramp-sh.el | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/lisp/net/tramp-sh.el b/lisp/net/tramp-sh.el
index e9814cd..f4a93c8 100644
--- a/lisp/net/tramp-sh.el
+++ b/lisp/net/tramp-sh.el
@@ -4960,9 +4960,10 @@ connection if a previous connection has died for some 
reason."
        (when (and (time-less-p
                    60 (time-since
                        (tramp-get-connection-property p "last-cmd-time" 0)))
-                  (process-live-p p)
-                  (tramp-get-connection-property p "connected" nil))
-         (unless (tramp-send-command-and-check vec "echo are you awake")
+                  (process-live-p p))
+         (tramp-send-command vec "echo are you awake" t t)
+         (unless (and (process-live-p p)
+                      (tramp-wait-for-output p 10))
            ;; The error will be caught locally.
            (tramp-error vec 'file-error "Awake did fail")))
       (file-error



reply via email to

[Prev in Thread] Current Thread [Next in Thread]