summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNoam Postavsky <npostavs@users.sourceforge.net>2020-08-19 12:49:11 +0200
committerLars Ingebrigtsen <larsi@gnus.org>2020-08-19 12:49:11 +0200
commitdc90e62276da36af14305e0dbe1076e2d041ac4f (patch)
tree99bde5102c26e821b852cbea49f5dfa60a5f57a3
parentba8cce26c83c195972a6952dd9546f7153bf93d3 (diff)
downloademacs-dc90e62276da36af14305e0dbe1076e2d041ac4f.tar.gz
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).
-rw-r--r--lisp/ido.el6
1 files changed, 4 insertions, 2 deletions
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)