tweak(evil-collection): remove the corfu hack, merged upstream

abougouffa · Dec 26, 2023 · 8947f29 · 8947f29
1 parent 8e6bc6d
commit 8947f29
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 8 deletions.
diff --git a/core/me-evil.el b/core/me-evil.el
@@ -64,13 +64,6 @@
                         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

diff --git a/local/straight/versions/default.el b/local/straight/versions/default.el
@@ -104,7 +104,7 @@
  ("esxml" . "225693096a587492d76bf696d1f0c25c61f7d531")
  ("evil" . "fc6bd006503258e5cc09c92de8882f4496992946")
  ("evil-anzu" . "d1e98ee6976437164627542909a25c6946497899")
- ("evil-collection" . "c30158a0df2e252f15cffcd61ceb0ad58a395096")
+ ("evil-collection" . "cf1a11912d1e77a197fab0e4f82d0c2268084455")
  ("evil-iedit-state" . "6f7b502447ba35676375169d7707372ebad2791f")
  ("evil-mc" . "bdf893ea6f52fd0f10bece8ddae813658e17bbb4")
  ("evil-multiedit" . "23b53bc8743fb82a8854ba907b1d277374c93a79")