From unknown Mon Aug 18 02:38:19 2025 X-Loop: help-debbugs@gnu.org Subject: bug#8329: 23.3.50; [PATCH] Get rid of one ido ugliness Resent-From: Leo Original-Sender: debbugs-submit-bounces@debbugs.gnu.org Resent-To: owner@debbugs.gnu.org Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Wed, 23 Mar 2011 16:58:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 8329 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: patch To: 8329@debbugs.gnu.org X-Debbugs-Original-To: bug-gnu-emacs@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.13008994463814 (code B ref -1); Wed, 23 Mar 2011 16:58:01 +0000 Received: (at submit) by debbugs.gnu.org; 23 Mar 2011 16:57:26 +0000 Received: from localhost ([127.0.0.1] helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1Q2RN6-0000zS-LH for submit@debbugs.gnu.org; Wed, 23 Mar 2011 12:57:24 -0400 Received: from eggs.gnu.org ([140.186.70.92]) by debbugs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1Q2RN4-0000zD-Bj for submit@debbugs.gnu.org; Wed, 23 Mar 2011 12:57:22 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Q2RMy-0001a6-6J for submit@debbugs.gnu.org; Wed, 23 Mar 2011 12:57:17 -0400 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on eggs.gnu.org X-Spam-Level: X-Spam-Status: No, score=-2.6 required=5.0 tests=BAYES_00,FREEMAIL_FROM, RCVD_IN_DNSWL_LOW, T_DKIM_INVALID, T_TO_NO_BRKTS_FREEMAIL autolearn=unavailable version=3.3.1 Received: from lists.gnu.org ([199.232.76.165]:39129) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Q2RMy-0001a0-15 for submit@debbugs.gnu.org; Wed, 23 Mar 2011 12:57:16 -0400 Received: from [140.186.70.92] (port=60654 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1Q2RMw-0004Jq-Ru for bug-gnu-emacs@gnu.org; Wed, 23 Mar 2011 12:57:15 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Q2RMv-0001ZX-Oa for bug-gnu-emacs@gnu.org; Wed, 23 Mar 2011 12:57:14 -0400 Received: from mail-pw0-f41.google.com ([209.85.160.41]:37170) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Q2RMv-0001ZR-K1 for bug-gnu-emacs@gnu.org; Wed, 23 Mar 2011 12:57:13 -0400 Received: by pwi10 with SMTP id 10so1684519pwi.0 for ; Wed, 23 Mar 2011 09:57:12 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:from:to:subject:date:message-id:mime-version :content-type; bh=ekWKOZyuTRjj3DIU87ZolhZ2d9QHIjKULdVaEVmjGdM=; b=WfBiF8yuHoq1YQFiIPVs88nxWTP0i6U0lOd34TaVu05YpDqeMoK2mKJlRZlcJ2uDXq sJlWjQxsx6rngDHl5fpsJyJpFQuYuYs1qH6XYRGuDRXekTKT6GiIzkohNPN+wBv9lf/s WyaNDegaEdhrp2VuTNkSqqmbUFNDM6y0KveoI= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=from:to:subject:date:message-id:mime-version:content-type; b=p39oxvMFPNlE2BLAXZpkYE8lwfQfcJ1BgNAxJvaQIx0Nlz338ouX/kkRUE4oGHZe04 YMM+bXBftep83B4tGxIyqbU1uOsJXxlkqmvsF9x2yL6d1MQDrnWfe++SM/iWnxUjV/Kd apKZmBkvEH46EfWGLG5R/KCizv5fBDkHUfaDU= Received: by 10.143.31.6 with SMTP id i6mr5415483wfj.52.1300899432083; Wed, 23 Mar 2011 09:57:12 -0700 (PDT) Received: from localhost (th041164.ip.tsinghua.edu.cn [59.66.41.164]) by mx.google.com with ESMTPS id w11sm10293021wfh.6.2011.03.23.09.57.08 (version=TLSv1/SSLv3 cipher=OTHER); Wed, 23 Mar 2011 09:57:10 -0700 (PDT) From: Leo Date: Thu, 24 Mar 2011 00:57:03 +0800 Message-ID: MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2) X-Received-From: 199.232.76.165 X-Spam-Score: -5.3 (-----) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.11 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: debbugs-submit-bounces@debbugs.gnu.org Errors-To: debbugs-submit-bounces@debbugs.gnu.org X-Spam-Score: -5.3 (-----) 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)) From unknown Mon Aug 18 02:38:19 2025 X-Loop: help-debbugs@gnu.org Subject: bug#8329: 23.3.50; [PATCH] Get rid of one ido ugliness Resent-From: Stefan Monnier Original-Sender: debbugs-submit-bounces@debbugs.gnu.org Resent-To: owner@debbugs.gnu.org Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Wed, 23 Mar 2011 20:29:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 8329 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: patch To: storm@cua.dk Cc: 8329@debbugs.gnu.org Received: via spool by 8329-submit@debbugs.gnu.org id=B8329.130091208722025 (code B ref 8329); Wed, 23 Mar 2011 20:29:02 +0000 Received: (at 8329) by debbugs.gnu.org; 23 Mar 2011 20:28:07 +0000 Received: from localhost ([127.0.0.1] helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1Q2Uf1-0005jC-Dz for submit@debbugs.gnu.org; Wed, 23 Mar 2011 16:28:07 -0400 Received: from ironport2-out.teksavvy.com ([206.248.154.183] helo=ironport2-out.pppoe.ca) by debbugs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1Q2Uez-0005ih-PC for 8329@debbugs.gnu.org; Wed, 23 Mar 2011 16:28:06 -0400 X-IronPort-Anti-Spam-Filtered: true X-IronPort-Anti-Spam-Result: AhAIAOr0iU1MCqfZ/2dsb2JhbACYS4x5eIhNuziFaQSVeA X-IronPort-AV: E=Sophos;i="4.63,233,1299474000"; d="scan'208";a="97753514" Received: from 76-10-167-217.dsl.teksavvy.com (HELO pastel.home) ([76.10.167.217]) by ironport2-out.pppoe.ca with ESMTP/TLS/ADH-AES256-SHA; 23 Mar 2011 16:27:59 -0400 Received: by pastel.home (Postfix, from userid 20848) id 8861B591E8; Wed, 23 Mar 2011 16:27:59 -0400 (EDT) From: Stefan Monnier Message-ID: References: Date: Wed, 23 Mar 2011 16:27:59 -0400 In-Reply-To: (Leo's message of "Thu, 24 Mar 2011 00:57:03 +0800") User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/24.0.50 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain X-Spam-Score: -2.1 (--) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.11 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: debbugs-submit-bounces@debbugs.gnu.org Errors-To: debbugs-submit-bounces@debbugs.gnu.org X-Spam-Score: -2.1 (--) > 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)) From unknown Mon Aug 18 02:38:19 2025 X-Loop: help-debbugs@gnu.org Subject: bug#8329: 23.3.50; [PATCH] Get rid of one ido ugliness Resent-From: Leo Original-Sender: debbugs-submit-bounces@debbugs.gnu.org Resent-To: owner@debbugs.gnu.org Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Thu, 24 Mar 2011 14:35:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 8329 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: patch To: Stefan Monnier Cc: 8329@debbugs.gnu.org, storm@cua.dk Received: via spool by 8329-submit@debbugs.gnu.org id=B8329.1300977286947 (code B ref 8329); Thu, 24 Mar 2011 14:35:02 +0000 Received: (at 8329) by debbugs.gnu.org; 24 Mar 2011 14:34:46 +0000 Received: from localhost ([127.0.0.1] helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1Q2lcc-0000FD-6k for submit@debbugs.gnu.org; Thu, 24 Mar 2011 10:34:46 -0400 Received: from mail-iw0-f172.google.com ([209.85.214.172]) by debbugs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1Q2lcb-0000Ez-10 for 8329@debbugs.gnu.org; Thu, 24 Mar 2011 10:34:45 -0400 Received: by iwl42 with SMTP id 42so4505iwl.3 for <8329@debbugs.gnu.org>; Thu, 24 Mar 2011 07:34:39 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:from:to:cc:subject:references:date:in-reply-to :message-id:user-agent:mime-version:content-type; bh=92rm8kp2lr/Ehuf/hFAyVJtieGRNtcdO/CeRTU5WLz0=; b=SPfVOfscRbICVWI14e+3uqDiIDCZGgdJrmfCrpkvLQbvg6AnIs7KClcTbGTSRF+KkN 69XviALSFDg8bpCFUs8UyNAfBP/vtJt7Sqt8w+Hdmsejy7+hA6XDQSoSPlcEOyqf/RZ9 ICHrDCavAN91kI41piQb/4NGD126fuHmoaNNk= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=from:to:cc:subject:references:date:in-reply-to:message-id :user-agent:mime-version:content-type; b=Mg/arf0EQGJjliCFBWkVpNEDrS+zVmMXMf655OFSmCV60K2eunx9uQQps3PfjO9X5e 4d4jqgXQSRwtbD6uiRUgw8hp+DBDJREBg1gZOx48vYBjFEARtlAVkY4xtHT33U+gnqbr hyF2nbyJ0t+oygv86Ebgb7r1p5u7W5IkZptMM= Received: by 10.42.159.6 with SMTP id j6mr13152399icx.260.1300977279325; Thu, 24 Mar 2011 07:34:39 -0700 (PDT) Received: from Victoria.local (th041164.ip.tsinghua.edu.cn [59.66.41.164]) by mx.google.com with ESMTPS id g17sm3585656ibb.57.2011.03.24.07.34.34 (version=TLSv1/SSLv3 cipher=OTHER); Thu, 24 Mar 2011 07:34:37 -0700 (PDT) From: Leo References: Date: Thu, 24 Mar 2011 22:34:26 +0800 In-Reply-To: (Stefan Monnier's message of "Wed, 23 Mar 2011 16:27:59 -0400") Message-ID: User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/23.3.50 (Mac OS X 10.6.7) MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii X-Spam-Score: -4.2 (----) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.11 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: debbugs-submit-bounces@debbugs.gnu.org Errors-To: debbugs-submit-bounces@debbugs.gnu.org X-Spam-Score: -4.2 (----) 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'. From unknown Mon Aug 18 02:38:19 2025 X-Loop: help-debbugs@gnu.org Subject: bug#8329: 23.3.50; [PATCH] Get rid of one ido ugliness Resent-From: Leo Original-Sender: debbugs-submit-bounces@debbugs.gnu.org Resent-To: owner@debbugs.gnu.org Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Fri, 25 Mar 2011 00:50:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 8329 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: patch To: Stefan Monnier Cc: 8329@debbugs.gnu.org, storm@cua.dk Received: via spool by 8329-submit@debbugs.gnu.org id=B8329.13010141507772 (code B ref 8329); Fri, 25 Mar 2011 00:50:03 +0000 Received: (at 8329) by debbugs.gnu.org; 25 Mar 2011 00:49:10 +0000 Received: from localhost ([127.0.0.1] helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1Q2vDC-00021J-7h for submit@debbugs.gnu.org; Thu, 24 Mar 2011 20:49:10 -0400 Received: from mail-iw0-f172.google.com ([209.85.214.172]) by debbugs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1Q2vDA-000217-80 for 8329@debbugs.gnu.org; Thu, 24 Mar 2011 20:49:08 -0400 Received: by iwl42 with SMTP id 42so497685iwl.3 for <8329@debbugs.gnu.org>; Thu, 24 Mar 2011 17:49:02 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:from:to:cc:subject:references:date:in-reply-to :message-id:user-agent:mime-version:content-type; bh=LD7J7ZPh2NQoyET9RbDqL1lEUULEOm5ZF/tRODTaxEw=; b=Q1PibXIu/8m5Klpvtn1yrCma80uW3jbpFMtgSOSN2S6b+Rl/PqQIeSep7lHYRZMifY zvZDHTfc7lEn7LihzdhfItMES5df6DTWwo99i9m+OC4ysfqnrWZY7iDDqWNZL/gc50bN 7z8qkgSAMJTxuenDPgw99q0yBdolgle/waxPI= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=from:to:cc:subject:references:date:in-reply-to:message-id :user-agent:mime-version:content-type; b=kBRdHebFvUsdqJHYZA2pL3zY6bBi7mvp+I044oE1Q55JIUopKRWzUisxEuubaGskly 7CaY51RhUrfRiXLLyTzJaQBW4Woz5tH7mw4K9hN3i+N/tYQxzMrduXxwv4p6rkuq4cNA 1Yhh9p731UgsNH2ji7+Wy8A0DXcrK0we+xJK4= Received: by 10.42.147.65 with SMTP id m1mr209474icv.217.1301014142619; Thu, 24 Mar 2011 17:49:02 -0700 (PDT) Received: from Victoria.local (th041093.ip.tsinghua.edu.cn [59.66.41.93]) by mx.google.com with ESMTPS id vx7sm256819icb.2.2011.03.24.17.48.59 (version=TLSv1/SSLv3 cipher=OTHER); Thu, 24 Mar 2011 17:49:01 -0700 (PDT) From: Leo References: Date: Fri, 25 Mar 2011 08:48:55 +0800 In-Reply-To: (Leo's message of "Thu, 24 Mar 2011 22:34:26 +0800") Message-ID: User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/23.3.50 (Mac OS X 10.6.7) MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii X-Spam-Score: -4.1 (----) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.11 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: debbugs-submit-bounces@debbugs.gnu.org Errors-To: debbugs-submit-bounces@debbugs.gnu.org X-Spam-Score: -4.1 (----) I have installed the patch in trunk for wider testing. I will leave this bug open for a few more days. From unknown Mon Aug 18 02:38:19 2025 MIME-Version: 1.0 X-Mailer: MIME-tools 5.427 (Entity 5.427) X-Loop: help-debbugs@gnu.org From: help-debbugs@gnu.org (GNU bug Tracking System) To: Leo Subject: bug#8329: closed (Re: bug#8329: 23.3.50; [PATCH] Get rid of one ido ugliness) Message-ID: References: X-Gnu-PR-Message: they-closed 8329 X-Gnu-PR-Package: emacs X-Gnu-PR-Keywords: patch Reply-To: 8329@debbugs.gnu.org Date: Sun, 27 Mar 2011 01:29:02 +0000 Content-Type: multipart/mixed; boundary="----------=_1301189342-11257-1" This is a multi-part message in MIME format... ------------=_1301189342-11257-1 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" 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 8329@debbugs.gnu.org. --=20 8329: http://debbugs.gnu.org/cgi/bugreport.cgi?bug=3D8329 GNU Bug Tracking System Contact help-debbugs@gnu.org with problems ------------=_1301189342-11257-1 Content-Type: message/rfc822 Content-Disposition: inline Content-Transfer-Encoding: 7bit Received: (at 8329-done) by debbugs.gnu.org; 27 Mar 2011 01:28:39 +0000 Received: from localhost ([127.0.0.1] helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1Q3emT-0002us-Ah for submit@debbugs.gnu.org; Sat, 26 Mar 2011 21:28:37 -0400 Received: from mail-px0-f170.google.com ([209.85.212.170]) by debbugs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1Q3emQ-0002uc-OV for 8329-done@debbugs.gnu.org; Sat, 26 Mar 2011 21:28:35 -0400 Received: by pxi19 with SMTP id 19so657086pxi.29 for <8329-done@debbugs.gnu.org>; Sat, 26 Mar 2011 18:28:28 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:from:to:subject:references:date:in-reply-to :message-id:user-agent:mime-version:content-type; bh=/+rO+df0RhFqmXh8OUXa1ijAhhSzStRVEKMODhXy37k=; b=SpaKvGB5CocABQdRWAZoNfiBOvTR4IQA3F6f3nPYj37dDWUxiPiTrtkxM1nVdJ4xHW bBxwV2ZmqbKFTP8LUZHXvRD1Wz/8uMpaWry1wkbGWKj9BejulMTXeqKoo+esmorrTwuC XZYV173cRhgmpXqnXrz7E98tPZcXKGMI2J9PE= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=from:to:subject:references:date:in-reply-to:message-id:user-agent :mime-version:content-type; b=Alwqh/nL2sOl3t37Xbf7u67AZQk0KqStxlffF4kKtctaaCrHHT6GYaZAumRji3zrcV gY09lt6B9ShcJNQLQxKrx64nsc029E3V4gF7yIcdoM3fuJK80GWD6bXm0mZnN3FojGCL NqyYGeqjmG6Pz6jnLyKuleSg5BLWQuRmlfKG0= Received: by 10.142.250.6 with SMTP id x6mr2197503wfh.229.1301189308692; Sat, 26 Mar 2011 18:28:28 -0700 (PDT) Received: from Victoria.local (th041092.ip.tsinghua.edu.cn [59.66.41.92]) by mx.google.com with ESMTPS id 25sm3628269wfb.22.2011.03.26.18.28.23 (version=TLSv1/SSLv3 cipher=OTHER); Sat, 26 Mar 2011 18:28:25 -0700 (PDT) From: Leo To: 8329-done@debbugs.gnu.org Subject: Re: bug#8329: 23.3.50; [PATCH] Get rid of one ido ugliness References: Date: Sun, 27 Mar 2011 09:28:19 +0800 In-Reply-To: (Leo's message of "Fri, 25 Mar 2011 08:48:55 +0800") Message-ID: User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/23.3.50 (Mac OS X 10.6.7) MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii X-Spam-Score: -4.1 (----) X-Debbugs-Envelope-To: 8329-done X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.11 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: debbugs-submit-bounces@debbugs.gnu.org Errors-To: debbugs-submit-bounces@debbugs.gnu.org X-Spam-Score: -4.1 (----) Version: 24.1 ------------=_1301189342-11257-1 Content-Type: message/rfc822 Content-Disposition: inline Content-Transfer-Encoding: 7bit Received: (at submit) by debbugs.gnu.org; 23 Mar 2011 16:57:26 +0000 Received: from localhost ([127.0.0.1] helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1Q2RN6-0000zS-LH for submit@debbugs.gnu.org; Wed, 23 Mar 2011 12:57:24 -0400 Received: from eggs.gnu.org ([140.186.70.92]) by debbugs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1Q2RN4-0000zD-Bj for submit@debbugs.gnu.org; Wed, 23 Mar 2011 12:57:22 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Q2RMy-0001a6-6J for submit@debbugs.gnu.org; Wed, 23 Mar 2011 12:57:17 -0400 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on eggs.gnu.org X-Spam-Level: X-Spam-Status: No, score=-2.6 required=5.0 tests=BAYES_00,FREEMAIL_FROM, RCVD_IN_DNSWL_LOW, T_DKIM_INVALID, T_TO_NO_BRKTS_FREEMAIL autolearn=unavailable version=3.3.1 Received: from lists.gnu.org ([199.232.76.165]:39129) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Q2RMy-0001a0-15 for submit@debbugs.gnu.org; Wed, 23 Mar 2011 12:57:16 -0400 Received: from [140.186.70.92] (port=60654 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1Q2RMw-0004Jq-Ru for bug-gnu-emacs@gnu.org; Wed, 23 Mar 2011 12:57:15 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Q2RMv-0001ZX-Oa for bug-gnu-emacs@gnu.org; Wed, 23 Mar 2011 12:57:14 -0400 Received: from mail-pw0-f41.google.com ([209.85.160.41]:37170) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Q2RMv-0001ZR-K1 for bug-gnu-emacs@gnu.org; Wed, 23 Mar 2011 12:57:13 -0400 Received: by pwi10 with SMTP id 10so1684519pwi.0 for ; Wed, 23 Mar 2011 09:57:12 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:from:to:subject:date:message-id:mime-version :content-type; bh=ekWKOZyuTRjj3DIU87ZolhZ2d9QHIjKULdVaEVmjGdM=; b=WfBiF8yuHoq1YQFiIPVs88nxWTP0i6U0lOd34TaVu05YpDqeMoK2mKJlRZlcJ2uDXq sJlWjQxsx6rngDHl5fpsJyJpFQuYuYs1qH6XYRGuDRXekTKT6GiIzkohNPN+wBv9lf/s WyaNDegaEdhrp2VuTNkSqqmbUFNDM6y0KveoI= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=from:to:subject:date:message-id:mime-version:content-type; b=p39oxvMFPNlE2BLAXZpkYE8lwfQfcJ1BgNAxJvaQIx0Nlz338ouX/kkRUE4oGHZe04 YMM+bXBftep83B4tGxIyqbU1uOsJXxlkqmvsF9x2yL6d1MQDrnWfe++SM/iWnxUjV/Kd apKZmBkvEH46EfWGLG5R/KCizv5fBDkHUfaDU= Received: by 10.143.31.6 with SMTP id i6mr5415483wfj.52.1300899432083; Wed, 23 Mar 2011 09:57:12 -0700 (PDT) Received: from localhost (th041164.ip.tsinghua.edu.cn [59.66.41.164]) by mx.google.com with ESMTPS id w11sm10293021wfh.6.2011.03.23.09.57.08 (version=TLSv1/SSLv3 cipher=OTHER); Wed, 23 Mar 2011 09:57:10 -0700 (PDT) From: Leo To: bug-gnu-emacs@gnu.org Subject: 23.3.50; [PATCH] Get rid of one ido ugliness Date: Thu, 24 Mar 2011 00:57:03 +0800 Message-ID: MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2) X-Received-From: 199.232.76.165 X-Spam-Score: -5.3 (-----) X-Debbugs-Envelope-To: submit X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.11 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: debbugs-submit-bounces@debbugs.gnu.org Errors-To: debbugs-submit-bounces@debbugs.gnu.org X-Spam-Score: -5.3 (-----) 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)) ------------=_1301189342-11257-1--