andros/emacs-gpu
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Allow using alists in ido completion and hitting TAB

Browse source 
* lisp/ido.el (ido-completion-help): Allow using an alist
COMPLETIONS (bug#46091).
This commit is contained in:
Lars Ingebrigtsen 2022-06-14 14:16:55 +02:00
parent 706ef0ae93
commit 441f081a64
1 changed files with 24 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

41
lisp/ido.el
View file

@ -3976,23 +3976,30 @@ If `ido-change-word-sub' cannot be found in WORD, return nil."
(setq display-it t))
(if (and ido-completion-buffer display-it)
(with-output-to-temp-buffer ido-completion-buffer
(let ((completion-list (sort
(cond
(ido-directory-too-big
(message "Reading directory...")
(setq ido-directory-too-big nil
ido-ignored-list nil
ido-cur-list (ido-all-completions)
ido-rescan t)
(ido-set-matches)
(or ido-matches ido-cur-list))
(ido-use-merged-list
(ido-flatten-merged-list (or ido-matches ido-cur-list)))
((or full-list ido-completion-buffer-all-completions)
(ido-all-completions))
(t
(copy-sequence (or ido-matches ido-cur-list))))
#'ido-file-lessp)))
(let* ((comps
(cond
(ido-directory-too-big
(message "Reading directory...")
(setq ido-directory-too-big nil
ido-ignored-list nil
ido-cur-list (ido-all-completions)
ido-rescan t)
(ido-set-matches)
(or ido-matches ido-cur-list))
(ido-use-merged-list
(ido-flatten-merged-list (or ido-matches ido-cur-list)))
((or full-list ido-completion-buffer-all-completions)
(ido-all-completions))
(t
(copy-sequence (or ido-matches ido-cur-list)))))
(completion-list
;; If we have an alist COMPLETIONS, transform to a
;; simple list first.
(sort (if (and (consp comps)
(consp (car comps)))
(mapcar #'car comps)
comps)
#'ido-file-lessp)))
;;(add-hook 'completion-setup-hook #'completion-setup-function)
(display-completion-list completion-list))))))