fix(evil-collection): fix corfu--setup signature

abougouffa · Dec 25, 2023 · feeae81 · feeae81
1 parent 2368c5b
commit feeae81
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 1 deletion.
diff --git a/core/me-completion.el b/core/me-completion.el
@@ -75,7 +75,6 @@ This depends on `+cape-hosts' and `+cape-global-capes'."
         (put '+cape-auto-capf-super 'enabled (not (or enabled disable)))))))
 
 (use-package corfu
-  :pin-ref "8b5dbebea284a8b5b06bbd5dd20c3ce82c13cb1a"
   :straight (corfu :files (:defaults "extensions/*.el"))
   :hook (minemacs-after-startup . global-corfu-mode)
   :hook (eshell-mode . +corfu-less-intrusive-h)

diff --git a/core/me-evil.el b/core/me-evil.el
@@ -64,6 +64,13 @@
                         elisp-mode)))) ; I don't like "gz" for `ielm', I like "gr" though
     evil-collection-mode-list))
 
+  ;; TEMP+FIX: Adapt `evil-collection-corfu' to the new `corfu--setup' signature, see:
+  ;; - https://github.com/minad/corfu/issues/403
+  ;; - https://github.com/emacs-evil/evil-collection/pull/767
+  (with-eval-after-load 'evil-collection-corfu
+    (advice-remove 'corfu--setup #'evil-normalize-keymaps)
+    (advice-add 'corfu--setup :after (lambda (&rest _) (evil-normalize-keymaps))))
+
   ;; Use "gr" to find references for elisp mode
   (with-eval-after-load 'elisp-mode
     (when evil-collection-want-find-usages-bindings