# HG changeset patch
# User Kim F. Storm <storm@cua.dk>
# Date 1175207602 0
# Node ID bcf68ba23417f65175e24d7886e3595efe273e54
# Parent  fbe60d04cec23371b213ca4dc7631c2432ea406d
(ido-read-internal): When reading file or dir, only override
minibuffer-local-filename-completion-map, otherwise only override
minibuffer-local-completion-map.

diff -r fbe60d04cec2 -r bcf68ba23417 lisp/ido.el
--- a/lisp/ido.el	Thu Mar 29 21:24:38 2007 +0000
+++ b/lisp/ido.el	Thu Mar 29 22:33:22 2007 +0000
@@ -1940,8 +1940,14 @@
       (if (and ido-matches (eq ido-try-merged-list 'auto))
 	  (setq ido-try-merged-list t))
       (let
-	  ((minibuffer-local-completion-map ido-completion-map)
-	   (minibuffer-local-filename-completion-map ido-completion-map)
+	  ((minibuffer-local-completion-map
+	    (if (memq ido-cur-item '(file dir))
+		minibuffer-local-completion-map
+	      ido-completion-map))
+	   (minibuffer-local-filename-completion-map
+	    (if (memq ido-cur-item '(file dir))
+		ido-completion-map
+	      minibuffer-local-filename-completion-map))
 	   (max-mini-window-height (or ido-max-window-height
 				       (and (boundp 'max-mini-window-height) max-mini-window-height)))
 	   (ido-completing-read t)