[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[elpa] externals/vertico 2cf22aa 2/3: Simplify vertico-mouse-mode
From: |
ELPA Syncer |
Subject: |
[elpa] externals/vertico 2cf22aa 2/3: Simplify vertico-mouse-mode |
Date: |
Tue, 26 Oct 2021 11:57:30 -0400 (EDT) |
branch: externals/vertico
commit 2cf22aae66c64c6d2238df4c54784abc8f93f9fe
Author: Daniel Mendler <mail@daniel-mendler.de>
Commit: Daniel Mendler <mail@daniel-mendler.de>
Simplify vertico-mouse-mode
---
extensions/vertico-mouse.el | 14 +++++---------
1 file changed, 5 insertions(+), 9 deletions(-)
diff --git a/extensions/vertico-mouse.el b/extensions/vertico-mouse.el
index 221ebc4..b1628c4 100644
--- a/extensions/vertico-mouse.el
+++ b/extensions/vertico-mouse.el
@@ -37,14 +37,6 @@
"Face used for mouse highlighting."
:group 'vertico-faces)
-(defvar vertico-mouse-map
- (let ((map (make-sparse-keymap)))
- (define-key map [mouse-1] #'vertico-mouse-exit)
- (define-key map [mouse-3] #'vertico-mouse-insert)
- map)
- "Mouse keymap bound to candidates.")
-(fset 'vertico-mouse-map vertico-mouse-map)
-
(defun vertico-mouse-exit (event)
"Exit after mouse EVENT."
(interactive "e")
@@ -69,7 +61,7 @@
(when (= index vertico--index)
(add-face-text-property 0 (length cand) 'vertico-current 'append cand)))
(add-text-properties 0 (1- (length cand))
- `(mouse-face vertico-mouse keymap vertico-mouse-map
vertico--mouse-index ,index)
+ `(mouse-face vertico-mouse vertico--mouse-index ,index)
cand)
cand)
@@ -92,9 +84,13 @@
:global t :group 'vertico
(cond
(vertico-mouse-mode
+ (define-key vertico-map [mouse-1] #'vertico-mouse-exit)
+ (define-key vertico-map [mouse-3] #'vertico-mouse-insert)
(advice-add #'vertico--format-candidate :around
#'vertico-mouse--format-candidate)
(advice-add #'vertico--setup :after #'vertico-mouse--setup))
(t
+ (assq-delete-all 'mouse-1 vertico-map)
+ (assq-delete-all 'mouse-3 vertico-map)
(advice-remove #'vertico--format-candidate
#'vertico-mouse--format-candidate)
(advice-remove #'vertico--setup #'vertico-reverse--setup))))