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

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

[elpa] externals/vertico 56642f8ea6: Simplify the keymap modification (S


From: ELPA Syncer
Subject: [elpa] externals/vertico 56642f8ea6: Simplify the keymap modification (See #176)
Date: Sat, 8 Jan 2022 12:57:55 -0500 (EST)

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

    Simplify the keymap modification (See #176)
---
 extensions/vertico-flat.el    | 6 +++---
 extensions/vertico-grid.el    | 6 +++---
 extensions/vertico-reverse.el | 6 +++---
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/extensions/vertico-flat.el b/extensions/vertico-flat.el
index 579ec98eea..698318e64b 100644
--- a/extensions/vertico-flat.el
+++ b/extensions/vertico-flat.el
@@ -129,13 +129,13 @@
     (window-resize win (- (window-pixel-height win)) nil nil 'pixelwise))
   (cond
    (vertico-flat-mode
-    (unless (eq (cadr vertico-map) vertico-flat-map)
+    (unless (memq vertico-flat-map vertico-map)
       (setcdr vertico-map (cons vertico-flat-map (cdr vertico-map))))
     (advice-add #'vertico--arrange-candidates :override 
#'vertico-flat--arrange-candidates)
     (advice-add #'vertico--display-candidates :override 
#'vertico-flat--display-candidates))
    (t
-    (when (eq (cadr vertico-map) vertico-flat-map)
-      (setcdr vertico-map (cddr vertico-map)))
+    (when (memq vertico-flat-map vertico-map)
+      (delq vertico-flat-map vertico-map))
     (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 4bd0d53fc2..779b05c061 100644
--- a/extensions/vertico-grid.el
+++ b/extensions/vertico-grid.el
@@ -155,12 +155,12 @@ When scrolling beyond this limit, candidates may be 
truncated."
     (window-resize win (- (window-pixel-height win)) nil nil 'pixelwise))
   (cond
    (vertico-grid-mode
-    (unless (eq (cadr vertico-map) vertico-grid-map)
+    (unless (memq vertico-grid-map vertico-map)
       (setcdr vertico-map (cons vertico-grid-map (cdr vertico-map))))
     (advice-add #'vertico--arrange-candidates :override 
#'vertico-grid--arrange-candidates))
    (t
-    (when (eq (cadr vertico-map) vertico-grid-map)
-      (setcdr vertico-map (cddr vertico-map)))
+    (when (memq vertico-grid-map vertico-map)
+      (delq vertico-grid-map vertico-map))
     (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 39856e3749..81ed8f83aa 100644
--- a/extensions/vertico-reverse.el
+++ b/extensions/vertico-reverse.el
@@ -76,12 +76,12 @@
       (overlay-put ov 'before-string nil)))
   (cond
    (vertico-reverse-mode
-    (unless (eq (cadr vertico-map) vertico-reverse-map)
+    (unless (memq vertico-reverse-map vertico-map)
       (setcdr vertico-map (cons vertico-reverse-map (cdr vertico-map))))
     (advice-add #'vertico--display-candidates :override 
#'vertico-reverse--display-candidates))
    (t
-    (when (eq (cadr vertico-map) vertico-reverse-map)
-      (setcdr vertico-map (cddr vertico-map)))
+    (when (memq vertico-reverse-map vertico-map)
+      (delq vertico-reverse-map vertico-map))
     (advice-remove #'vertico--display-candidates 
#'vertico-reverse--display-candidates))))
 
 (provide 'vertico-reverse)



reply via email to

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