From: Kim F. Storm <storm@cua.dk>
Date: Thu, 28 Apr 2005 15:09:34 +0000 (+0000)
Subject: (ido-everywhere): Fix last change.
X-Git-Tag: ttn-vms-21-2-B4~673
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=d6810a2d5d0e3f6d9d1031e14ce393bb7dadfd26;p=emacs.git

(ido-everywhere): Fix last change.
---

diff --git a/lisp/ido.el b/lisp/ido.el
index 1c95676db0a..4c6db529ef7 100644
--- a/lisp/ido.el
+++ b/lisp/ido.el
@@ -1347,19 +1347,17 @@ This function also adds a hook to the minibuffer."
 			   (> (prefix-numeric-value arg) 0)
 			 (not ido-everywhere)))
   (when (get 'ido-everywhere 'file)
-    (setq read-file-name-function (get 'ido-everywhere 'file))
+    (setq read-file-name-function (car (get 'ido-everywhere 'file)))
     (put 'ido-everywhere 'file nil))
   (when (get 'ido-everywhere 'buffer)
-    (setq read-buffer-function (get 'ido-everywhere 'buffer))
+    (setq read-buffer-function (car (get 'ido-everywhere 'buffer)))
     (put 'ido-everywhere 'buffer nil))
   (when ido-everywhere
     (when (memq ido-mode '(both file))
-      (unless (get 'ido-everywhere 'file)
-	(put 'ido-everywhere 'file read-file-name-function))
+      (put 'ido-everywhere 'file (cons read-file-name-function nil))
       (setq read-file-name-function 'ido-read-file-name))
     (when (memq ido-mode '(both buffer))
-      (unless (get 'ido-everywhere 'buffer)
-	(put 'ido-everywhere 'buffer read-buffer-function))
+      (put 'ido-everywhere 'buffer (cons read-buffer-function nil))
       (setq read-buffer-function 'ido-read-buffer))))