[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[elpa] externals/ivy 44f1408 2/2: Merge branch 'master' into externals/i
From: |
Basil L. Contovounesios |
Subject: |
[elpa] externals/ivy 44f1408 2/2: Merge branch 'master' into externals/ivy |
Date: |
Fri, 30 Jul 2021 13:50:58 -0400 (EDT) |
branch: externals/ivy
commit 44f1408664188bea70c977ce0fd1112b9f3b27a9
Merge: 7ba793d 20d78ae
Author: Basil L. Contovounesios <contovob@tcd.ie>
Commit: Basil L. Contovounesios <contovob@tcd.ie>
Merge branch 'master' into externals/ivy
---
ivy.el | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
diff --git a/ivy.el b/ivy.el
index 659ba3e..c693ab7 100644
--- a/ivy.el
+++ b/ivy.el
@@ -2986,8 +2986,11 @@ tries to ensure that it does not change depending on the
number of candidates."
(defun ivy--minibuffer-setup ()
"Setup ivy completion in the minibuffer."
- (setq-local mwheel-scroll-up-function 'ivy-next-line)
- (setq-local mwheel-scroll-down-function 'ivy-previous-line)
+ ;; Guard for --without-x builds where `mwheel' is not preloaded.
+ (when (boundp 'mwheel-scroll-up-function)
+ (setq-local mwheel-scroll-up-function 'ivy-next-line))
+ (when (boundp 'mwheel-scroll-down-function)
+ (setq-local mwheel-scroll-down-function 'ivy-previous-line))
(setq-local completion-show-inline-help nil)
(setq-local line-spacing nil)
(setq-local minibuffer-default-add-function
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [elpa] externals/ivy 44f1408 2/2: Merge branch 'master' into externals/ivy,
Basil L. Contovounesios <=