branch: externals/vertico
commit 420fefee87166c2fb613eab143368d7f01628af2
Author: Daniel Mendler <[email protected]>
Commit: Daniel Mendler <[email protected]>
Rename horizontico to vertico-flat
---
README.org | 5 ++--
extensions/{horizontico.el => vertico-flat.el} | 36 ++++++++++++--------------
2 files changed, 19 insertions(+), 22 deletions(-)
diff --git a/README.org b/README.org
index 4e54b39..61f24ff 100644
--- a/README.org
+++ b/README.org
@@ -152,8 +152,8 @@
We maintain a few small extension packages to Vertico in this repository
in the subdirectory
[[https://github.com/minad/vertico/tree/main/extensions][extensions/]].
Currently these extensions are available:
- -
[[https://github.com/minad/vertico/blob/main/extensions/horizontico.el][horizontico.el]]:
HORIZONTal Interactive COmpletion
-
[[https://github.com/minad/vertico/blob/main/extensions/vertico-buffer.el][vertico-buffer.el]]:
Offers =vertico-buffer-mode= to display Vertico in a separate buffer
+ -
[[https://github.com/minad/vertico/blob/main/extensions/vertico-flat.el][vertico-flat.el]]:
Flat, horizontal display for Vertico
-
[[https://github.com/minad/vertico/blob/main/extensions/vertico-directory.el][vertico-directory.el]]:
Commands for Ido-like directory navigation
-
[[https://github.com/minad/vertico/blob/main/extensions/vertico-repeat.el][vertico-repeat.el]]:
The command =vertico-repeate= repeats the last completion session
-
[[https://github.com/minad/vertico/blob/main/extensions/vertico-reverse.el][vertico-reverse.el]]:
Offers =vertico-reverse-mode=, which reverses the display
@@ -218,7 +218,8 @@
([[https://github.com/raxod502/selectrum/issues/481][Issue #481]]), since
it uses its own filtering infrastructure, which deviates
from the standard Emacs completion facilities. Selectrum supports
additional
Avy-style quick keys. Vertico additionally has the ability to cycle over
- candidates and offers more commands for grouping support.
+ candidates, offers more commands for grouping support and comes with
+ optional [[#extensions][extensions]].
- [[https://github.com/oantolin/icomplete-vertical][Icomplete-vertical]]:
This package enhances the Emacs builtin Icomplete with a
vertical display. In contrast to Vertico, the candidates are rotated such
that
the current candidate always appears at the top. From my perspective,
diff --git a/extensions/horizontico.el b/extensions/vertico-flat.el
similarity index 67%
rename from extensions/horizontico.el
rename to extensions/vertico-flat.el
index 856d186..cba6ee5 100644
--- a/extensions/horizontico.el
+++ b/extensions/vertico-flat.el
@@ -1,4 +1,4 @@
-;;; horizontico.el --- HORIZONTal Interactive COmpletion -*- lexical-binding:
t -*-
+;;; vertico-flat.el --- Flat, horizontal display for Vertico -*-
lexical-binding: t -*-
;; Copyright (C) 2021 Free Software Foundation, Inc.
@@ -27,10 +27,9 @@
(require 'vertico)
-(defvar horizontico--orig-group-format nil)
-(defvar horizontico--orig-count nil)
+(defvar vertico-flat--group-format nil)
-(defun horizontico--display (candidates)
+(defun vertico-flat--display (candidates)
"Display CANDIDATES horizontally."
(move-overlay vertico--candidates-ov (point-max) (point-max))
(when (>= vertico--index 0)
@@ -56,27 +55,24 @@
(concat "{" (string-join candidates " | ") "}")
"[No match]"))))
-(defun horizontico--disable-annotations (_ candidates)
+(defun vertico-flat--disable-annotations (_ candidates)
"Return CANDIDATES without adding annotations."
candidates)
;;;###autoload
-(define-minor-mode horizontico-mode
- "HORIZONTal Interactive COmpletion."
+(define-minor-mode vertico-flat-mode
+ "Flat, horizontal display for Vertico."
:global t
(cond
- (horizontico-mode
- (setq horizontico--orig-group-format vertico-group-format
- horizontico--orig-count vertico-count
- vertico-group-format nil
- vertico-count 20)
- (advice-add #'vertico--affixate :override
#'horizontico--disable-annotations)
- (advice-add #'vertico--display-candidates :override
#'horizontico--display))
+ (vertico-flat-mode
+ (setq vertico-flat--group-format vertico-group-format
+ vertico-group-format nil)
+ (advice-add #'vertico--affixate :override
#'vertico-flat--disable-annotations)
+ (advice-add #'vertico--display-candidates :override
#'vertico-flat--display))
(t
- (setq vertico-group-format horizontico--orig-group-format
- vertico-count horizontico--orig-count)
- (advice-remove #'vertico--affixate #'horizontico--disable-annotations)
- (advice-remove #'vertico--display-candidates #'horizontico--display))))
+ (setq vertico-group-format vertico-flat--group-format)
+ (advice-remove #'vertico--affixate #'vertico-flat--disable-annotations)
+ (advice-remove #'vertico--display-candidates #'vertico-flat--display))))
-(provide 'horizontico)
-;;; horizontico.el ends here
+(provide 'vertico-flat)
+;;; vertico-flat.el ends here
