From: João Távora <joaotavora@gmail.com>
Date: Mon, 27 Feb 2023 18:40:48 +0000 (+0200)
Subject: * lisp/icomplete.el (fido-mode): Enable in-buffer completion (bug#45763).
X-Git-Tag: emacs-29.0.90~277
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=db50545e3e9cd51dd8e6ad93034dc48d45b705e2;p=emacs.git

* lisp/icomplete.el (fido-mode): Enable in-buffer completion (bug#45763).

Backport:
(cherry picked from commit b5c13032538377b0037c745715613693a1580f81)
---

diff --git a/lisp/icomplete.el b/lisp/icomplete.el
index fd6a09e8702..0adb0e5afeb 100644
--- a/lisp/icomplete.el
+++ b/lisp/icomplete.el
@@ -443,9 +443,12 @@ more like `ido-mode' than regular `icomplete-mode'."
   :global t
   (remove-hook 'minibuffer-setup-hook #'icomplete-minibuffer-setup)
   (remove-hook 'minibuffer-setup-hook #'icomplete--fido-mode-setup)
+  (remove-hook 'completion-in-region-mode-hook #'icomplete--in-region-setup)
   (when fido-mode
     (icomplete-mode -1)
     (setq icomplete-mode t)
+    (when icomplete-in-buffer
+      (add-hook 'completion-in-region-mode-hook #'icomplete--in-region-setup))
     (add-hook 'minibuffer-setup-hook #'icomplete-minibuffer-setup)
     (add-hook 'minibuffer-setup-hook #'icomplete--fido-mode-setup)))