From: Noam Postavsky <npostavs@users.sourceforge.net>
Date: Wed, 19 Aug 2020 10:49:11 +0000 (+0200)
Subject: Let ido-everywhere turn on ido-mode
X-Git-Tag: emacs-28.0.90~6518
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=dc90e62276da36af14305e0dbe1076e2d041ac4f;p=emacs.git

Let ido-everywhere turn on ido-mode

* lisp/ido.el (ido-everywhere): Turn on ido-mode, if it's not already
on.  Otherwise, having ido-everywhere enabled messes all file and
buffer reading interactive commands (bug#34292).
---

diff --git a/lisp/ido.el b/lisp/ido.el
index ad7500c0a1e..c83b700e656 100644
--- a/lisp/ido.el
+++ b/lisp/ido.el
@@ -1523,8 +1523,10 @@ Removes badly formatted data and ignored directories."
   (remove-function read-file-name-function #'ido-read-file-name)
   (remove-function read-buffer-function #'ido-read-buffer)
   (when ido-everywhere
-    (add-function :override read-file-name-function #'ido-read-file-name)
-    (add-function :override read-buffer-function #'ido-read-buffer)))
+    (if (not ido-mode)
+        (ido-mode 'both)
+      (add-function :override read-file-name-function #'ido-read-file-name)
+      (add-function :override read-buffer-function #'ido-read-buffer))))
 
 (defvar ido-minor-mode-map-entry nil)