From: Dmitry Gutov <dgutov@yandex.ru>
Date: Fri, 22 May 2020 00:37:56 +0000 (+0300)
Subject: Disable ido-everywhere when ido-mode is off
X-Git-Tag: emacs-28.0.90~7303
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=813e42c63bcd9f285daae6737c4ae7a9adae90d7;p=emacs.git

Disable ido-everywhere when ido-mode is off

* lisp/ido.el (ido-mode): Disable the effects of 'ido-everywhere'
when ido-mode is turned off.
---

diff --git a/lisp/ido.el b/lisp/ido.el
index 5716c6ff442..ad71d468cb4 100644
--- a/lisp/ido.el
+++ b/lisp/ido.el
@@ -1549,7 +1549,7 @@ This function also adds a hook to the minibuffer."
 	 ((> (prefix-numeric-value arg) 0) 'both)
 	 (t nil)))
 
-  (ido-everywhere (if ido-everywhere 1 -1))
+  (ido-everywhere (if (and ido-mode ido-everywhere) 1 -1))
 
   (when ido-mode
     (ido-common-initialization)