summaryrefslogtreecommitdiff
path: root/lisp/ido.el
diff options
context:
space:
mode:
authorMichael Albinus <michael.albinus@gmx.de>2017-02-15 19:42:34 +0100
committerMichael Albinus <michael.albinus@gmx.de>2017-02-15 19:42:34 +0100
commitadfb6f1dc26a927cf4bab24bdfae54b51e3ae0ec (patch)
tree739d83cd439a34ab7745970d6f6e16cb52f931f2 /lisp/ido.el
parent6220faeb4e9be16b9dec728e72ea8dff2cfe35ba (diff)
Continue to fix bug#25607
* lisp/ido.el (ido-complete): Let-bind `non-essential' to nil. (ido-file-name-all-completions-1): Do not bind `non-essential'. * lisp/net/tramp.el: (tramp-completion-file-name-handler): Improve autoloaded version. (tramp-completion-file-name-handler): Remove old compat code. Check only for `tramp-completion-mode-p'. (tramp-completion-mode-p): Autoload. Do not check any longer for `last-input-event'. (tramp-completion-handle-expand-file-name): Simplify. (Bug#25607)
Diffstat (limited to 'lisp/ido.el')
-rw-r--r--lisp/ido.el3
1 files changed, 1 insertions, 2 deletions
diff --git a/lisp/ido.el b/lisp/ido.el
index e18464d1d6b..561d6e7f081 100644
--- a/lisp/ido.el
+++ b/lisp/ido.el
@@ -2541,7 +2541,7 @@ If cursor is not at the end of the user input, move to end of input."
(defun ido-complete ()
"Try and complete the current pattern amongst the file names."
(interactive)
- (let (res)
+ (let (non-essential res)
(cond
(ido-incomplete-regexp
;; Do nothing
@@ -3556,7 +3556,6 @@ it is put to the start of the list."
;; Strip method:user@host: part of tramp completions.
;; Tramp completions do not include leading slash.
(let* ((len (1- (length dir)))
- (non-essential t)
(compl
(or ;; We do not want to be disturbed by "File does not
;; exist" errors.