GNU bug report logs - #8329
23.3.50; [PATCH] Get rid of one ido ugliness

Previous Next

To add a comment to this bug, you must first unarchive it, by sending
a message to control AT debbugs.gnu.org, with unarchive 8329 in the body.
You can then email your comments to 8329 AT debbugs.gnu.org in the normal way.

Toggle the display of automated, internal messages from the tracker.

Message #5 received at submit <at> debbugs.gnu.org (full text, mbox):

From: Leo <sdl.web <at> gmail.com>
To: bug-gnu-emacs <at> gnu.org
Subject: 23.3.50; [PATCH] Get rid of one ido ugliness
Date: Thu, 24 Mar 2011 00:57:03 +0800

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))
 

Message #8 received at 8329 <at> debbugs.gnu.org (full text, mbox):

From: Stefan Monnier <monnier <at> iro.umontreal.ca>
To: storm <at> cua.dk
Cc: 8329 <at> debbugs.gnu.org
Subject: Re: bug#8329: 23.3.50; [PATCH] Get rid of one ido ugliness
Date: Wed, 23 Mar 2011 16:27:59 -0400

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

Kim, any opinion?


        Stefan


> === 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))
 

Message #11 received at 8329 <at> debbugs.gnu.org (full text, mbox):

From: Leo <sdl.web <at> gmail.com>
To: Stefan Monnier <monnier <at> iro.umontreal.ca>
Cc: 8329 <at> debbugs.gnu.org, storm <at> cua.dk
Subject: Re: bug#8329: 23.3.50; [PATCH] Get rid of one ido ugliness
Date: Thu, 24 Mar 2011 22:34:26 +0800

On 2011-03-24 04:27 +0800, Stefan Monnier wrote:
>> The following patch replaces ugly completing-read form with a simpler
>> and cleaner read-from-minibuffer.
>
> Kim, any opinion?

Please also review the diff hunk:

@@ -4590,17 +4581,13 @@ (defun ido-exhibit ()
 
 	;; Insert the match-status information:
 	(ido-set-common-completion)
-	(let ((inf (ido-completions
-		    contents
-		    minibuffer-completion-table
-		    minibuffer-completion-predicate
-		    (not minibuffer-completion-confirm))))
+	(let ((inf (ido-completions contents)))
 	  (setq ido-show-confirm-message nil)
 	  (ido-trace "inf" inf)
 	  (insert inf))
 	))))
 
-(defun ido-completions (name candidates predicate require-match)
+(defun ido-completions (name)
   ;; Return the string that is displayed after the user's text.
   ;; Modified from `icomplete-completions'.
 

Message #14 received at 8329 <at> debbugs.gnu.org (full text, mbox):

From: Leo <sdl.web <at> gmail.com>
To: Stefan Monnier <monnier <at> iro.umontreal.ca>
Cc: 8329 <at> debbugs.gnu.org, storm <at> cua.dk
Subject: Re: bug#8329: 23.3.50; [PATCH] Get rid of one ido ugliness
Date: Fri, 25 Mar 2011 08:48:55 +0800

I have installed the patch in trunk for wider testing. I will leave this
bug open for a few more days.

Message #19 received at 8329-done <at> debbugs.gnu.org (full text, mbox):

From: Leo <sdl.web <at> gmail.com>
To: 8329-done <at> debbugs.gnu.org
Subject: Re: bug#8329: 23.3.50; [PATCH] Get rid of one ido ugliness
Date: Sun, 27 Mar 2011 09:28:19 +0800

Version: 24.1

Previous Next

GNU bug tracking system
Copyright (C) 1999 Darren O. Benham, 1997,2003 nCipher Corporation Ltd, 1994-97 Ian Jackson.