From f4aa2a8ca7a3d865f03a81714ab058f18265397a Mon Sep 17 00:00:00 2001 From: Henrik Lissner Date: Wed, 11 Mar 2020 22:17:00 -0400 Subject: [PATCH] Bump :completion ivy abo-abo/swiper@7084d60 -> abo-abo/swiper@5f1d9ce Yevgnen/ivy-rich@af43aba -> Yevgnen/ivy-rich@0f22aff Fixes ivy-dispatching-done on Emacs 27+ --- modules/completion/ivy/config.el | 16 ++++------------ modules/completion/ivy/packages.el | 4 ++-- 2 files changed, 6 insertions(+), 14 deletions(-) diff --git a/modules/completion/ivy/config.el b/modules/completion/ivy/config.el index 38743296d..fd262e1d0 100644 --- a/modules/completion/ivy/config.el +++ b/modules/completion/ivy/config.el @@ -99,19 +99,11 @@ evil-ex-specific constructs, so we disable it solely in evil-ex." (define-key! ivy-minibuffer-map "C-c C-e" #'+ivy/woccur - [remap doom/delete-backward-word] #'ivy-backward-kill-word) + [remap doom/delete-backward-word] #'ivy-backward-kill-word + "C-o" #'ivy-dispatching-done + "M-o" #'hydra-ivy/body) - (ivy-mode +1) - - (use-package! ivy-hydra - :commands (ivy-dispatching-done ivy--matcher-desc ivy-hydra/body) - :init - (define-key! ivy-minibuffer-map - "C-o" #'ivy-dispatching-done - "M-o" #'hydra-ivy/body) - :config - ;; ivy-hydra rebinds this, so we have to do so again - (define-key ivy-minibuffer-map (kbd "M-o") #'hydra-ivy/body))) + (ivy-mode +1)) (use-package! ivy-rich diff --git a/modules/completion/ivy/packages.el b/modules/completion/ivy/packages.el index 7fb20ae1b..40b28ce3d 100644 --- a/modules/completion/ivy/packages.el +++ b/modules/completion/ivy/packages.el @@ -1,14 +1,14 @@ ;; -*- no-byte-compile: t; -*- ;;; completion/ivy/packages.el -(package! swiper :pin "7084d60312") +(package! swiper :pin "5f1d9ce045") (package! ivy) (package! ivy-hydra) (package! counsel) (package! amx :pin "e512e74e83") (package! counsel-projectile :pin "b556ed8995") -(package! ivy-rich :pin "af43abad5c") +(package! ivy-rich :pin "0f22aff4c7") (package! wgrep :pin "5977b8e000") (if (featurep! +prescient)