From 84230a437dfca913ba94c39f7a61c41d24a7cfbd Mon Sep 17 00:00:00 2001
From: Henrik Lissner <git@henrik.io>
Date: Mon, 2 Sep 2024 16:59:29 -0400
Subject: [PATCH] fix(corfu): `global-corfu-minibuffer` predicate not respected

As mentioned in #7977, `global-corfu-modes` overrides any predicate
function in `global-corfu-minibuffer`. This is a stopgap until the issue
is resolved upstream.

Fix: #7977
Close: #8039
Co-authored-by: LemonBreezes <LemonBreezes@users.noreply.github.com>
---
 modules/completion/corfu/config.el | 17 +++++++++++------
 1 file changed, 11 insertions(+), 6 deletions(-)

diff --git a/modules/completion/corfu/config.el b/modules/completion/corfu/config.el
index b543393dd..df9a0a48d 100644
--- a/modules/completion/corfu/config.el
+++ b/modules/completion/corfu/config.el
@@ -43,12 +43,17 @@ If any return non-nil, `corfu-auto' will not invoke as-you-type completion.")
   (setq corfu-auto t
         corfu-auto-delay 0.24
         corfu-auto-prefix 2
-        global-corfu-modes '((not erc-mode
-                                  circe-mode
-                                  help-mode
-                                  gud-mode
-                                  vterm-mode)
-                             t)
+        global-corfu-modes
+        '((not erc-mode
+               circe-mode
+               help-mode
+               gud-mode
+               vterm-mode
+               ;; Needed for `+corfu-want-minibuffer-completion' to be
+               ;; respected. See #7977.
+               minibuffer-mode
+               minibuffer-inactive-mode)
+          t)
         corfu-cycle t
         corfu-preselect 'prompt
         corfu-count 16