[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] master d8c7bf6 1/2: Make recent Tramp patch work for tramp
From: |
Michael Albinus |
Subject: |
[Emacs-diffs] master d8c7bf6 1/2: Make recent Tramp patch work for tramp-archive.el |
Date: |
Fri, 13 Sep 2019 06:08:46 -0400 (EDT) |
branch: master
commit d8c7bf6683a16b4830fc1de1af49c58cd6163269
Author: Michael Albinus <address@hidden>
Commit: Michael Albinus <address@hidden>
Make recent Tramp patch work for tramp-archive.el
* lisp/net/tramp.el (tramp-connectable-p): Make it work also for
tramp-archive.el.
---
lisp/net/tramp.el | 11 +++++------
1 file changed, 5 insertions(+), 6 deletions(-)
diff --git a/lisp/net/tramp.el b/lisp/net/tramp.el
index 8903d38..aefb84b 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