pestctrl/emacs
1
0
Fork 0
forked from Github/emacs
Code Issues Pull requests Projects Releases Packages Wiki Activity

Jump to first,last completion with M-<, M-> in icomplete-vertical-mode

Browse source 
Fixes: bug#49005

Co-authored-by: Simon Lang <simon.lang@outlook.com>

* lisp/icomplete.el (icomplete-backward-completions): Return
non-nil iff something was stepped.  Ajust docstring.
(icomplete-forward-completions): Adjust docstring.
(icomplete-vertical-goto-first, icomplete-vertical-goto-last): New commands.
(icomplete-vertical-mode-minibuffer-map): Bind new commands to M-< and M->.
This commit is contained in:
João Távora 2021-08-17 12:48:37 +01:00
parent bf1ec4952e
commit 96bbd6f0a7
1 changed files with 29 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

41
lisp/icomplete.el
View file

@ -249,7 +249,8 @@ the default otherwise."
(defun icomplete-forward-completions ()
"Step forward completions by one entry.
Second entry becomes the first and can be selected with
`icomplete-force-complete-and-exit'."
`icomplete-force-complete-and-exit'.
Return non-nil iff something was stepped."
(interactive)
(let* ((beg (icomplete--field-beg))
(end (icomplete--field-end))
@ -266,21 +267,35 @@ Second entry becomes the first and can be selected with
(defun icomplete-backward-completions ()
"Step backward completions by one entry.
Last entry becomes the first and can be selected with
`icomplete-force-complete-and-exit'."
`icomplete-force-complete-and-exit'.
Return non-nil iff something was stepped."
(interactive)
(let* ((beg (icomplete--field-beg))
(end (icomplete--field-end))
(comps (completion-all-sorted-completions beg end))
last-but-one)
(cond ((and icomplete-scroll icomplete--scrolled-past)
(push (pop icomplete--scrolled-past) comps)
(setq icomplete--scrolled-completions comps))
((and (not icomplete-scroll)
(consp (cdr (setq last-but-one (last comps 2)))))
;; At least two elements in comps
(push (car (cdr last-but-one)) comps)
(setcdr last-but-one (cdr (cdr last-but-one)))))
(completion--cache-all-sorted-completions beg end comps)))
last-but-one)
(prog1
(cond ((and icomplete-scroll icomplete--scrolled-past)
(push (pop icomplete--scrolled-past) comps)
(setq icomplete--scrolled-completions comps))
((and (not icomplete-scroll)
(consp (cdr (setq last-but-one (last comps 2)))))
;; At least two elements in comps
(push (car (cdr last-but-one)) comps)
(setcdr last-but-one (cdr (cdr last-but-one)))))
(completion--cache-all-sorted-completions beg end comps))))
(defun icomplete-vertical-goto-first ()
"Go to first completions entry when `icomplete-scroll' is non-nil."
(interactive)
(unless icomplete-scroll (error "Only works with `icomplete-scroll'"))
(while (icomplete-backward-completions)))
(defun icomplete-vertical-goto-last ()
"Go to last completions entry when `icomplete-scroll' is non-nil."
(interactive)
(unless icomplete-scroll (error "Only works with `icomplete-scroll'"))
(while (icomplete-forward-completions)))
;;;_* Helpers for `fido-mode' (or `ido-mode' emulation)
@ -609,6 +624,8 @@ Usually run by inclusion in `minibuffer-setup-hook'."
(let ((map (make-sparse-keymap)))
(define-key map (kbd "C-n") 'icomplete-forward-completions)
(define-key map (kbd "C-p") 'icomplete-backward-completions)
(define-key map (kbd "M-<") 'icomplete-vertical-goto-first)
(define-key map (kbd "M->") 'icomplete-vertical-goto-last)
map)
"Keymap used by `icomplete-vertical-mode' in the minibuffer.")