From: Michael Albinus <michael.albinus@gmx.de>
Date: Fri, 13 Sep 2019 10:08:02 +0000 (+0200)
Subject: Make recent Tramp patch work for tramp-archive.el
X-Git-Tag: emacs-27.0.90~1551^2~84
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=d8c7bf6683a16b4830fc1de1af49c58cd6163269;p=emacs.git

Make recent Tramp patch work for tramp-archive.el

* lisp/net/tramp.el (tramp-connectable-p): Make it work also for
tramp-archive.el.
---

diff --git a/lisp/net/tramp.el b/lisp/net/tramp.el
index 8903d38d20f..aefb84bb4e4 100644
--- a/lisp/net/tramp.el
+++ b/lisp/net/tramp.el
@@ -2530,12 +2530,11 @@ not in completion mode."
 	  ((tramp-file-name-p vec-or-filename) vec-or-filename)
 	  ((tramp-tramp-file-p vec-or-filename)
 	   (tramp-dissect-file-name vec-or-filename)))))
-    (when vec
-      (or ;; We check this for the process related to
-	  ;; `tramp-buffer-name'; otherwise `start-file-process'
-	  ;; wouldn't run ever when `non-essential' is non-nil.
-	  (process-live-p (get-process (tramp-buffer-name vec)))
-	  (not (tramp-completion-mode-p))))))
+    (or ;; We check this for the process related to
+	;; `tramp-buffer-name'; otherwise `start-file-process'
+	;; wouldn't run ever when `non-essential' is non-nil.
+        (and vec (process-live-p (get-process (tramp-buffer-name vec))))
+	(not (tramp-completion-mode-p)))))
 
 ;; Method, host name and user name completion.
 ;; `tramp-completion-dissect-file-name' returns a list of