Github/emacs
2
0
Fork 1
mirror of git://git.sv.gnu.org/emacs.git synced 2026-02-16 17:24:23 +00:00
Code Issues Projects Releases Packages Wiki Activity

Revert last change in tramp-maybe-open-connection)

Browse source 
* lisp/net/tramp-sh.el (tramp-maybe-open-connection): Revert last change,
it causes trouble.
This commit is contained in:
Michael Albinus 2020-12-15 12:50:50 +01:00
parent 8bc5bd5b03
commit c8aad8cc11
1 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
lisp/net/tramp-sh.el
View file

@ -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