From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Leo Newsgroups: gmane.emacs.bugs Subject: bug#8329: 23.3.50; [PATCH] Get rid of one ido ugliness Date: Thu, 24 Mar 2011 00:57:03 +0800 Message-ID: NNTP-Posting-Host: lo.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii X-Trace: dough.gmane.org 1300900240 16956 80.91.229.12 (23 Mar 2011 17:10:40 GMT) X-Complaints-To: usenet@dough.gmane.org NNTP-Posting-Date: Wed, 23 Mar 2011 17:10:40 +0000 (UTC) To: 8329@debbugs.gnu.org Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Wed Mar 23 18:10:28 2011 Return-path: Envelope-to: geb-bug-gnu-emacs@m.gmane.org Original-Received: from lists.gnu.org ([199.232.76.165]) by lo.gmane.org with esmtp (Exim 4.69) (envelope-from ) id 1Q2RZk-0007Wc-5s for geb-bug-gnu-emacs@m.gmane.org; Wed, 23 Mar 2011 18:10:28 +0100 Original-Received: from localhost ([127.0.0.1]:57476 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1Q2RZj-0002tR-Es for geb-bug-gnu-emacs@m.gmane.org; Wed, 23 Mar 2011 13:10:27 -0400 Original-Received: from [140.186.70.92] (port=51780 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1Q2RZY-0002rq-Un for bug-gnu-emacs@gnu.org; Wed, 23 Mar 2011 13:10:19 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Q2RZX-0004ed-G9 for bug-gnu-emacs@gnu.org; Wed, 23 Mar 2011 13:10:16 -0400 Original-Received: from debbugs.gnu.org ([140.186.70.43]:48832) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Q2RZX-0004eN-EY for bug-gnu-emacs@gnu.org; Wed, 23 Mar 2011 13:10:15 -0400 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.69) (envelope-from ) id 1Q2RNi-00010O-24; Wed, 23 Mar 2011 12:58:02 -0400 X-Loop: help-debbugs@gnu.org 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 X-Debbugs-Original-To: bug-gnu-emacs@gnu.org Original-Received: via spool by submit@debbugs.gnu.org id=B.13008994463814 (code B ref -1); Wed, 23 Mar 2011 16:58:01 +0000 Original-Received: (at submit) by debbugs.gnu.org; 23 Mar 2011 16:57:26 +0000 Original-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 Original-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 Original-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 Original-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 Original-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 Original-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 Original-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 Original-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= Original-Received: by 10.143.31.6 with SMTP id i6mr5415483wfj.52.1300899432083; Wed, 23 Mar 2011 09:57:12 -0700 (PDT) Original-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) 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-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.11 Precedence: list Resent-Date: Wed, 23 Mar 2011 12:58:02 -0400 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 3) X-Received-From: 140.186.70.43 X-BeenThere: bug-gnu-emacs@gnu.org List-Id: "Bug reports for GNU Emacs, the Swiss army knife of text editors" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Original-Sender: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Errors-To: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Xref: news.gmane.org gmane.emacs.bugs:45282 Archived-At: 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))