diff options
| author | Michael Albinus <michael.albinus@gmx.de> | 2017-03-09 19:44:37 +0100 |
|---|---|---|
| committer | Michael Albinus <michael.albinus@gmx.de> | 2017-03-09 19:44:37 +0100 |
| commit | 37b88d7b92ba77a771ce0dbff940b3dec1a366c5 (patch) | |
| tree | a50ff6a979eecb2753c34cea32560330741cd3d9 /lisp/minibuffer.el | |
| parent | 550c23d326da983af082ad8f0227ace16c652021 (diff) | |
| download | emacs-37b88d7b92ba77a771ce0dbff940b3dec1a366c5.tar.gz | |
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/minibuffer.el')
| -rw-r--r-- | lisp/minibuffer.el | 31 |
1 files changed, 16 insertions, 15 deletions
diff --git a/lisp/minibuffer.el b/lisp/minibuffer.el index 00722ec4b15..530670fab76 100644 --- a/lisp/minibuffer.el +++ b/lisp/minibuffer.el @@ -894,21 +894,22 @@ This overrides the defaults specified in `completion-category-defaults'." ;; The quote/unquote function needs to come from the completion table (rather ;; than from completion-extra-properties) because it may apply only to some ;; part of the string (e.g. substitute-in-file-name). - (let ((requote - (when (completion-metadata-get metadata 'completion--unquote-requote) - (cl-assert (functionp table)) - (let ((new (funcall table string point 'completion--unquote))) - (setq string (pop new)) - (setq table (pop new)) - (setq point (pop new)) - (cl-assert (<= point (length string))) - (pop new)))) - (result - (completion--some (lambda (style) - (funcall (nth n (assq style - completion-styles-alist)) - string table pred point)) - (completion--styles metadata)))) + (let* ((requote + (when (completion-metadata-get metadata 'completion--unquote-requote) + (cl-assert (functionp table)) + (let ((new (funcall table string point 'completion--unquote))) + (setq string (pop new)) + (setq table (pop new)) + (setq point (pop new)) + (cl-assert (<= point (length string))) + (pop new)))) + (non-essential t) + (result + (completion--some (lambda (style) + (funcall (nth n (assq style + completion-styles-alist)) + string table pred point)) + (completion--styles metadata)))) (if requote (funcall requote result n) result))) |