summaryrefslogtreecommitdiff
path: root/lisp/icomplete.el
diff options
context:
space:
mode:
authorGregory Heytings <gregory@heytings.org>2021-04-10 11:47:45 +0100
committerJoão Távora <joaotavora@gmail.com>2021-04-10 23:51:05 +0100
commit5761e9004aa73d3aa7c34be9a064a1e768c3129c (patch)
tree2af8c46dd4dfc5e230315ed3dfc329bb57d1a925 /lisp/icomplete.el
parentffd12743bd8ef6e10cf0d96bc1ae08992075cbf1 (diff)
downloademacs-5761e9004aa73d3aa7c34be9a064a1e768c3129c.tar.gz
Add new icomplete-vertical-mode
Co-authored-by: João Távora <joaotavora@gmail.com> * lisp/icomplete.el (icomplete-completions): Consider icomplete-vertical-mode. (icomplete-vertical-mode-minibuffer-map): New map. (icomplete--vertical-minibuffer-setup): New helper. (icomplete-vertical-mode): New minor mode. * doc/emacs/buffers.texi (Icomplete): Mention icomplete-vertical-mode. * etc/NEWS: Mention icomplete-vertical-mode
Diffstat (limited to 'lisp/icomplete.el')
-rw-r--r--lisp/icomplete.el42
1 files changed, 38 insertions, 4 deletions
diff --git a/lisp/icomplete.el b/lisp/icomplete.el
index da589c00649..d5b6f76d7b2 100644
--- a/lisp/icomplete.el
+++ b/lisp/icomplete.el
@@ -562,6 +562,37 @@ Usually run by inclusion in `minibuffer-setup-hook'."
(completion--cache-all-sorted-completions beg end (cons comp all))))
finally return all)))
+(defvar icomplete-vertical-mode-minibuffer-map
+ (let ((map (make-sparse-keymap)))
+ (define-key map (kbd "C-n") 'icomplete-forward-completions)
+ (define-key map (kbd "C-p") 'icomplete-backward-completions)
+ map)
+ "Keymap used by `icomplete-vertical-mode' in the minibuffer.")
+
+(defun icomplete--vertical-minibuffer-setup ()
+ "Setup the minibuffer for vertical display of completion candidates."
+ (use-local-map (make-composed-keymap icomplete-vertical-mode-minibuffer-map
+ (current-local-map)))
+ (setq-local icomplete-separator "\n"
+ icomplete-hide-common-prefix nil
+ ;; Ask `icomplete-completions' to return enough completions candidates.
+ icomplete-prospects-height 25
+ redisplay-adhoc-scroll-in-resize-mini-windows nil))
+
+;;;###autoload
+(define-minor-mode icomplete-vertical-mode
+ "Toggle vertical candidate display in `icomplete-mode' or `fido-mode'.
+
+As many completion candidates as possible are displayed, depending on
+the value of `max-mini-window-height', and the way the mini-window is
+resized depends on `resize-mini-windows'."
+ :global t
+ (remove-hook 'icomplete-minibuffer-setup-hook
+ #'icomplete--vertical-minibuffer-setup)
+ (when icomplete-vertical-mode
+ (add-hook 'icomplete-minibuffer-setup-hook
+ #'icomplete--vertical-minibuffer-setup)))
+
@@ -784,10 +815,13 @@ matches exist."
(if last (setcdr last base-size))
(if prospects
(concat determ
- "{"
- (mapconcat 'identity prospects icomplete-separator)
- (and limit (concat icomplete-separator ellipsis))
- "}")
+ (if icomplete-vertical-mode " \n" "{")
+ (mapconcat 'identity prospects (if icomplete-vertical-mode
+ "\n"
+ icomplete-separator))
+ (unless icomplete-vertical-mode
+ (concat (and limit (concat icomplete-separator ellipsis))
+ "}")))
(concat determ " [Matched]"))))))
;;; Iswitchb compatibility