summaryrefslogtreecommitdiff
path: root/lisp/net/tramp-sh.el
diff options
context:
space:
mode:
authorMichael Albinus <michael.albinus@gmx.de>2017-03-09 19:44:37 +0100
committerMichael Albinus <michael.albinus@gmx.de>2017-03-09 19:44:37 +0100
commit37b88d7b92ba77a771ce0dbff940b3dec1a366c5 (patch)
treea50ff6a979eecb2753c34cea32560330741cd3d9 /lisp/net/tramp-sh.el
parent550c23d326da983af082ad8f0227ace16c652021 (diff)
downloademacs-37b88d7b92ba77a771ce0dbff940b3dec1a366c5.tar.gz
emacs-37b88d7b92ba77a771ce0dbff940b3dec1a366c5.tar.bz2
emacs-37b88d7b92ba77a771ce0dbff940b3dec1a366c5.zip
Fix bug#23006
* lisp/minibuffer.el (completion--nth-completion): Let-bind `non-essential'. * lisp/net/tramp.el (tramp-completion-mode): Fix docstring. (tramp-completion-mode-p): Optional parameter VEC. Replace check for `last-input-event' by analysing VEC argument. (tramp-error-with-buffer, tramp-file-name-handler) (tramp-connectable-p, tramp-handle-file-name-as-directory): * lisp/net/tramp-sh.el (tramp-maybe-open-connection): Use it.
Diffstat (limited to 'lisp/net/tramp-sh.el')
-rw-r--r--lisp/net/tramp-sh.el2
1 files changed, 1 insertions, 1 deletions
diff --git a/lisp/net/tramp-sh.el b/lisp/net/tramp-sh.el
index 85619621d90..6cd52ae4e03 100644
--- a/lisp/net/tramp-sh.el
+++ b/lisp/net/tramp-sh.el
@@ -4654,7 +4654,7 @@ connection if a previous connection has died for some reason."
;; 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 (tramp-completion-mode-p)
+ (when (and (tramp-completion-mode-p vec)
(null (get-process (tramp-buffer-name vec))))
(throw 'non-essential 'non-essential))