Subject: bug#8329: closed (Re: bug#8329: 23.3.50; [PATCH] Get rid of one ido ugliness)

From: [email-masked] (GNU bug Tracking System)
Date: Sun, 27 Mar 2011 01:29:02 +0000

Your bug report

#8329: 23.3.50; [PATCH] Get rid of one ido ugliness

which was filed against the emacs package, has been closed.

The explanation is attached below, along with your original report.
If you require more details, please reply to [email-masked].

-- 
8329: http://debbugs.gnu.org/cgi/bugreport.cgi?bug=8329
GNU Bug Tracking System
Contact [email-masked] with problems

Subject: Re: bug#8329: 23.3.50; [PATCH] Get rid of one ido ugliness
From: Leo <[email-masked]>
To: [email-masked]
Date: Sun, 27 Mar 2011 09:28:19 +0800
List-Id: <debbugs-submit.debbugs.gnu.org>

Version: 24.1

Subject: 23.3.50; [PATCH] Get rid of one ido ugliness
From: Leo <[email-masked]>
To: [email-masked]
Date: Thu, 24 Mar 2011 00:57:03 +0800
List-Id: <debbugs-submit.debbugs.gnu.org>

The following patch replaces ugly completing-read form with a simpler
and cleaner read-from-minibuffer.

=== modified file 'lisp/ido.el'
--- lisp/ido.el	2011-03-21 17:48:36 +0000
+++ lisp/ido.el	2011-03-23 16:47:26 +0000
@@ -1964,17 +1964,9 @@
       (ido-set-matches)
       (if (and ido-matches (eq ido-try-merged-list 'auto))
 	  (setq ido-try-merged-list t))
-      (let
-	  ((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)))
+      (let ((max-mini-window-height (or ido-max-window-height
+					(and (boundp 'max-mini-window-height)
+					     max-mini-window-height)))
 	   (ido-completing-read t)
 	   (ido-require-match require-match)
 	   (ido-use-mycompletion-depth (1+ (minibuffer-depth)))
@@ -1985,12 +1977,11 @@
 	(setq ido-exit nil)
 	(setq ido-final-text
 	      (catch 'ido
-		(completing-read-default
-		 (ido-make-prompt item prompt)
-		 '(("dummy" . 1)) nil nil ; table predicate require-match
-		 (prog1 ido-text-init (setq ido-text-init nil))	;initial-contents
-		 history))))
-      (ido-trace "completing-read" ido-final-text)
+		(read-from-minibuffer (ido-make-prompt item prompt)
+				      (prog1 ido-text-init
+					(setq ido-text-init nil))
+				      ido-completion-map nil history))))
+      (ido-trace "read-from-minibuffer" ido-final-text)
       (if (get-buffer ido-completion-buffer)
 	  (kill-buffer ido-completion-buffer))