summaryrefslogtreecommitdiff
path: root/lisp/net/tramp-sh.el
diff options
context:
space:
mode:
Diffstat (limited to 'lisp/net/tramp-sh.el')
-rw-r--r--lisp/net/tramp-sh.el7
1 files changed, 3 insertions, 4 deletions
diff --git a/lisp/net/tramp-sh.el b/lisp/net/tramp-sh.el
index a3641c6c401..1489405b84c 100644
--- a/lisp/net/tramp-sh.el
+++ b/lisp/net/tramp-sh.el
@@ -4653,12 +4653,11 @@ connection if a previous connection has died for some reason."
(condition-case err
(unless (tramp-compat-process-live-p p)
- ;; If `non-essential' is non-nil, don't reopen a new connection.
- ;; This variable has been introduced with Emacs 24.1.
- ;; We check this for the process related to
+ ;; During completion, don't reopen a new connection. 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.
- (when (and (boundp 'non-essential) (symbol-value 'non-essential)
+ (when (and (tramp-completion-mode-p)
(null (get-process (tramp-buffer-name vec))))
(throw 'non-essential 'non-essential))