master 813e42c 1/2: Disable ido-everywhere when ido-mode is off

[Dmitry Gutov]

branch: master
commit 813e42c63bcd9f285daae6737c4ae7a9adae90d7
Author: Dmitry Gutov <address@hidden>
Commit: Dmitry Gutov <address@hidden>

    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.
---
 lisp/ido.el | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lisp/ido.el b/lisp/ido.el
index 5716c6f..ad71d46 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)