summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Albinus <michael.albinus@gmx.de>2019-09-13 12:08:02 +0200
committerMichael Albinus <michael.albinus@gmx.de>2019-09-13 12:08:02 +0200
commitd8c7bf6683a16b4830fc1de1af49c58cd6163269 (patch)
treee89e1f37581fdb07164526c0b12f255985548bfb
parent5940ac63300c71b983b173c99c718920c179cbf8 (diff)
downloademacs-d8c7bf6683a16b4830fc1de1af49c58cd6163269.tar.gz
emacs-d8c7bf6683a16b4830fc1de1af49c58cd6163269.tar.bz2
emacs-d8c7bf6683a16b4830fc1de1af49c58cd6163269.zip
Make recent Tramp patch work for tramp-archive.el
* lisp/net/tramp.el (tramp-connectable-p): Make it work also for tramp-archive.el.
-rw-r--r--lisp/net/tramp.el11
1 files changed, 5 insertions, 6 deletions
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