procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

* lisp/completion-preview.el: Fix use in non-GUI session

Browse source 
Fix loading in non-GUI sessions where `mwheel` is not preloaded.
Not requiring `mwheel` would be a lot more complex, since it would
require delaying the construction of `completion-preview--mouse-map`.

* lisp/completion-preview.el (<toplevel>): Require `mwheel`.
Remove correspondingly redundant `defvar`s.
(completion-preview--mouse-map): Use `key-description` rather than mimicking
it with `format`.
This commit is contained in:
Stefan Monnier 2024-01-12 18:08:31 -05:00
parent eb779ae646
commit 82f71e106a
1 changed files with 10 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
lisp/completion-preview.el
View file

@ -52,6 +52,8 @@
;;; Code:
(require 'mwheel)
(defgroup completion-preview nil
"In-buffer completion preview."
:group 'completion)
@ -128,19 +130,19 @@ If this option is nil, these commands do not display any message."
;; "M-p" #'completion-preview-prev-candidate
)
(defvar mouse-wheel-up-event)
(defvar mouse-wheel-up-alternate-event)
(defvar mouse-wheel-down-event)
(defvar mouse-wheel-down-alternate-event)
(defvar-keymap completion-preview--mouse-map
:doc "Keymap for mouse clicks on the completion preview."
"<down-mouse-1>" #'completion-preview-insert
"C-<down-mouse-1>" #'completion-at-point
"<down-mouse-2>" #'completion-at-point
(format "<%s>" mouse-wheel-up-event) #'completion-preview-prev-candidate
(format "<%s>" mouse-wheel-up-alternate-event) #'completion-preview-prev-candidate
(format "<%s>" mouse-wheel-down-event) #'completion-preview-next-candidate
(format "<%s>" mouse-wheel-down-alternate-event) #'completion-preview-next-candidate)
(key-description (vector mouse-wheel-up-event))
#'completion-preview-prev-candidate
(key-description (vector mouse-wheel-up-alternate-event))
#'completion-preview-prev-candidate
(key-description (vector mouse-wheel-down-event))
#'completion-preview-next-candidate
(key-description (vector mouse-wheel-down-alternate-event))
#'completion-preview-next-candidate)
(defvar-local completion-preview--overlay nil)