emacs-elpa-diffs
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[elpa] externals/vertico 6f2172da72: Improve keymap setup


From: ELPA Syncer
Subject: [elpa] externals/vertico 6f2172da72: Improve keymap setup
Date: Thu, 17 Aug 2023 06:59:05 -0400 (EDT)

branch: externals/vertico
commit 6f2172da72dc168750dda717baa0b3d514487ac1
Author: Daniel Mendler <mail@daniel-mendler.de>
Commit: Daniel Mendler <mail@daniel-mendler.de>

    Improve keymap setup
    
    Remove keymap based on object identity instead of equality.
---
 extensions/vertico-flat.el      | 6 +++---
 extensions/vertico-grid.el      | 6 +++---
 extensions/vertico-multiform.el | 6 +++---
 extensions/vertico-reverse.el   | 6 +++---
 4 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/extensions/vertico-flat.el b/extensions/vertico-flat.el
index 8395aeb6ee..3eb66d57cc 100644
--- a/extensions/vertico-flat.el
+++ b/extensions/vertico-flat.el
@@ -78,9 +78,9 @@
   (when-let (win (active-minibuffer-window))
     (unless (frame-root-window-p win)
       (window-resize win (- (window-pixel-height win)) nil nil 'pixelwise)))
-  (if vertico-flat-mode
-      (add-to-list 'minor-mode-map-alist `(vertico--input . ,vertico-flat-map))
-    (setq minor-mode-map-alist (delete `(vertico--input . ,vertico-flat-map) 
minor-mode-map-alist))))
+  (setq minor-mode-map-alist (rassq-delete-all vertico-flat-map 
minor-mode-map-alist))
+  (when vertico-flat-mode
+    (push `(vertico--input . ,vertico-flat-map) minor-mode-map-alist)))
 
 (cl-defmethod vertico--display-candidates (candidates &context 
(vertico-flat-mode (eql t)))
   (setq-local truncate-lines nil
diff --git a/extensions/vertico-grid.el b/extensions/vertico-grid.el
index ef299571b3..adb7708b9e 100644
--- a/extensions/vertico-grid.el
+++ b/extensions/vertico-grid.el
@@ -112,9 +112,9 @@ When scrolling beyond this limit, candidates may be 
truncated."
   (when-let (win (active-minibuffer-window))
     (unless (frame-root-window-p win)
       (window-resize win (- (window-pixel-height win)) nil nil 'pixelwise)))
-  (if vertico-grid-mode
-      (add-to-list 'minor-mode-map-alist `(vertico--input . ,vertico-grid-map))
-    (setq minor-mode-map-alist (delete `(vertico--input . ,vertico-grid-map) 
minor-mode-map-alist))))
+  (setq minor-mode-map-alist (rassq-delete-all vertico-grid-map 
minor-mode-map-alist))
+  (when vertico-grid-mode
+    (push `(vertico--input . ,vertico-grid-map) minor-mode-map-alist)))
 
 (cl-defmethod vertico--arrange-candidates (&context (vertico-grid-mode (eql 
t)))
   (when (<= vertico--index 0)
diff --git a/extensions/vertico-multiform.el b/extensions/vertico-multiform.el
index 6b06ae4ab4..ab81d7ffa6 100644
--- a/extensions/vertico-multiform.el
+++ b/extensions/vertico-multiform.el
@@ -154,9 +154,9 @@ The keys in LIST can be symbols or regexps."
   (when vertico-multiform--stack
     (warn "vertico-multiform state is inconsistent")
     (setq vertico-multiform--stack nil))
-  (if vertico-multiform-mode
-      (add-to-list 'minor-mode-map-alist `(vertico--input . 
,vertico-multiform-map))
-    (setq minor-mode-map-alist (delete `(vertico--input . 
,vertico-multiform-map) minor-mode-map-alist))))
+  (setq minor-mode-map-alist (rassq-delete-all vertico-multiform-map 
minor-mode-map-alist))
+  (when vertico-multiform-mode
+    (push `(vertico--input . ,vertico-multiform-map) minor-mode-map-alist)))
 
 (cl-defmethod vertico--advice (&context (vertico-multiform-mode (eql t)) &rest 
app)
   (unwind-protect
diff --git a/extensions/vertico-reverse.el b/extensions/vertico-reverse.el
index df9bfd0d09..c3aa0fd5cd 100644
--- a/extensions/vertico-reverse.el
+++ b/extensions/vertico-reverse.el
@@ -60,9 +60,9 @@
   (dolist (buf (buffer-list))
     (when-let (ov (buffer-local-value 'vertico--candidates-ov buf))
       (overlay-put ov 'before-string nil)))
-  (if vertico-reverse-mode
-      (add-to-list 'minor-mode-map-alist `(vertico--input . 
,vertico-reverse-map))
-    (setq minor-mode-map-alist (delete `(vertico--input . 
,vertico-reverse-map) minor-mode-map-alist))))
+  (setq minor-mode-map-alist (rassq-delete-all vertico-reverse-map 
minor-mode-map-alist))
+  (when vertico-reverse-mode
+    (push `(vertico--input . ,vertico-reverse-map) minor-mode-map-alist)))
 
 (cl-defmethod vertico--display-candidates (lines &context 
(vertico-reverse-mode (eql t)))
   (move-overlay vertico--candidates-ov (point-min) (point-min))



reply via email to

[Prev in Thread] Current Thread [Next in Thread]