branch: externals/vertico
commit f748b9f5d844e36d09e4dfe43c4defbb7976d26d
Author: Daniel Mendler <[email protected]>
Commit: Daniel Mendler <[email protected]>
Use minor-mode-map-alist for extensions (Fix #176)
Thanks, @oantolin!
---
extensions/vertico-flat.el | 6 ++----
extensions/vertico-grid.el | 6 ++----
extensions/vertico-reverse.el | 6 ++----
3 files changed, 6 insertions(+), 12 deletions(-)
diff --git a/extensions/vertico-flat.el b/extensions/vertico-flat.el
index 698318e64b..69cb18260e 100644
--- a/extensions/vertico-flat.el
+++ b/extensions/vertico-flat.el
@@ -129,13 +129,11 @@
(window-resize win (- (window-pixel-height win)) nil nil 'pixelwise))
(cond
(vertico-flat-mode
- (unless (memq vertico-flat-map vertico-map)
- (setcdr vertico-map (cons vertico-flat-map (cdr vertico-map))))
+ (add-to-list 'minor-mode-map-alist `(vertico--input . ,vertico-flat-map))
(advice-add #'vertico--arrange-candidates :override
#'vertico-flat--arrange-candidates)
(advice-add #'vertico--display-candidates :override
#'vertico-flat--display-candidates))
(t
- (when (memq vertico-flat-map vertico-map)
- (delq vertico-flat-map vertico-map))
+ (setq minor-mode-map-alist (remove `(vertico--input . ,vertico-flat-map)
minor-mode-map-alist))
(advice-remove #'vertico--arrange-candidates
#'vertico-flat--arrange-candidates)
(advice-remove #'vertico--display-candidates
#'vertico-flat--display-candidates))))
diff --git a/extensions/vertico-grid.el b/extensions/vertico-grid.el
index 779b05c061..2f6180aa40 100644
--- a/extensions/vertico-grid.el
+++ b/extensions/vertico-grid.el
@@ -155,12 +155,10 @@ When scrolling beyond this limit, candidates may be
truncated."
(window-resize win (- (window-pixel-height win)) nil nil 'pixelwise))
(cond
(vertico-grid-mode
- (unless (memq vertico-grid-map vertico-map)
- (setcdr vertico-map (cons vertico-grid-map (cdr vertico-map))))
+ (add-to-list 'minor-mode-map-alist `(vertico--input . ,vertico-grid-map))
(advice-add #'vertico--arrange-candidates :override
#'vertico-grid--arrange-candidates))
(t
- (when (memq vertico-grid-map vertico-map)
- (delq vertico-grid-map vertico-map))
+ (setq minor-mode-map-alist (remove `(vertico--input . ,vertico-grid-map)
minor-mode-map-alist))
(advice-remove #'vertico--arrange-candidates
#'vertico-grid--arrange-candidates))))
;; Emacs 28: Do not show Vertico commands in M-X
diff --git a/extensions/vertico-reverse.el b/extensions/vertico-reverse.el
index 81ed8f83aa..22fa79f60c 100644
--- a/extensions/vertico-reverse.el
+++ b/extensions/vertico-reverse.el
@@ -76,12 +76,10 @@
(overlay-put ov 'before-string nil)))
(cond
(vertico-reverse-mode
- (unless (memq vertico-reverse-map vertico-map)
- (setcdr vertico-map (cons vertico-reverse-map (cdr vertico-map))))
+ (add-to-list 'minor-mode-map-alist `(vertico--input .
,vertico-reverse-map))
(advice-add #'vertico--display-candidates :override
#'vertico-reverse--display-candidates))
(t
- (when (memq vertico-reverse-map vertico-map)
- (delq vertico-reverse-map vertico-map))
+ (setq minor-mode-map-alist (remove `(vertico--input .
,vertico-reverse-map) minor-mode-map-alist))
(advice-remove #'vertico--display-candidates
#'vertico-reverse--display-candidates))))
(provide 'vertico-reverse)
