From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Juri Linkov Newsgroups: gmane.emacs.devel Subject: Re: C-r and C-s in minibuffer should search completion Date: Tue, 25 Mar 2008 23:44:18 +0200 Organization: JURTA Message-ID: <87prtiik0l.fsf@jurta.org> References: NNTP-Posting-Host: lo.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii X-Trace: ger.gmane.org 1206482329 24158 80.91.229.12 (25 Mar 2008 21:58:49 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Tue, 25 Mar 2008 21:58:49 +0000 (UTC) Cc: emacs-devel@gnu.org To: Stefan Monnier Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Tue Mar 25 22:59:20 2008 Return-path: Envelope-to: ged-emacs-devel@m.gmane.org Original-Received: from lists.gnu.org ([199.232.76.165]) by lo.gmane.org with esmtp (Exim 4.50) id 1JeHAq-0002Vd-2d for ged-emacs-devel@m.gmane.org; Tue, 25 Mar 2008 22:59:16 +0100 Original-Received: from localhost ([127.0.0.1] helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1JeHAE-0004HK-RN for ged-emacs-devel@m.gmane.org; Tue, 25 Mar 2008 17:58:38 -0400 Original-Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1JeHAB-0004HA-2o for emacs-devel@gnu.org; Tue, 25 Mar 2008 17:58:35 -0400 Original-Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1JeHA9-0004Gq-GZ for emacs-devel@gnu.org; Tue, 25 Mar 2008 17:58:34 -0400 Original-Received: from [199.232.76.173] (helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1JeHA9-0004Gn-9d for emacs-devel@gnu.org; Tue, 25 Mar 2008 17:58:33 -0400 Original-Received: from relay01.kiev.sovam.com ([62.64.120.200]) by monty-python.gnu.org with esmtps (TLS-1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.60) (envelope-from ) id 1JeHA8-0005bR-Qj for emacs-devel@gnu.org; Tue, 25 Mar 2008 17:58:33 -0400 Original-Received: from [83.170.232.243] (helo=smtp.svitonline.com) by relay01.kiev.sovam.com with esmtp (Exim 4.67) (envelope-from ) id 1JeHA5-0009iQ-Qg; Tue, 25 Mar 2008 23:58:30 +0200 In-Reply-To: (Stefan Monnier's message of "Thu, 20 Mar 2008 15:13:54 -0400") User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/23.0.60 (x86_64-pc-linux-gnu) X-Scanner-Signature: eacc24c597fa83a26e5f02f00d1ff66c X-DrWeb-checked: yes X-SpamTest-Envelope-From: juri@jurta.org X-SpamTest-Group-ID: 00000000 X-SpamTest-Header: Not Detected X-SpamTest-Info: Profiles 2491 [Mar 25 2008] X-SpamTest-Info: helo_type=3 X-SpamTest-Info: {HEADERS: header Content-Type found without required header Content-Transfer-Encoding} X-SpamTest-Info: {TO: local part of email appears in body} X-SpamTest-Method: none X-SpamTest-Rate: 15 X-SpamTest-Status: Not detected X-SpamTest-Status-Extended: not_detected X-SpamTest-Version: SMTP-Filter Version 3.0.0 [0255], KAS30/Release X-detected-kernel: by monty-python.gnu.org: FreeBSD 4.8-5.1 (or MacOS X 10.2-10.3) X-BeenThere: emacs-devel@gnu.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "Emacs development discussions." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Original-Sender: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Errors-To: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Xref: news.gmane.org gmane.emacs.devel:93451 Archived-At: > I believe C-s and C-r in the minibuffer should not only search the > history but the completion table as well (at least when it's not > a function). > > Could someone implement this feature? I now have an idea how to implement this feature. Some time ago I submitted a patch that introduces a new variable `minibuffer-default-set-function' that extends a list of defaults when minibuffer position hits the bottom of the list of defaults. http://lists.gnu.org/archive/html/emacs-devel/2007-12/msg00179.html This patch was approved by Richard but not installed because it was undecided where to move mailcap.el. The patch uses this variable for `shell-command' to append a list of available mailcap commands to the list of defaults only when the user types M-n below the default value. The same could be done for the list of completions. The patch below implements a new function `minibuffer-default-add-completions' that appends a list of all completions to the end of the list of defaults. It would be good to use this function by default since it is useful to search the completion table in all minibuffers that have it. Index: lisp/simple.el =================================================================== RCS file: /sources/emacs/emacs/lisp/simple.el,v retrieving revision 1.911 diff -c -r1.911 simple.el *** lisp/simple.el 23 Mar 2008 22:52:20 -0000 1.911 --- lisp/simple.el 25 Mar 2008 21:43:34 -0000 *************** *** 1304,1313 **** --- 1305,1339 ---- (defvar minibuffer-temporary-goal-position nil) + (defvar minibuffer-default-set-function 'minibuffer-default-add-completions + "*Function run by `goto-history-element' before using `minibuffer-default'. + This is useful to dynamically set the value of `minibuffer-default' + before `goto-history-element' reads it when moves into the future.") + + (make-variable-buffer-local 'minibuffer-default-set-function) + + (defun minibuffer-default-add-completions () + "Return a list of all completions without the default value. + This function is used to add all elements of the completion table to + the end of the list of defaults after the default value." + (interactive) + (let ((def minibuffer-default) + (all (all-completions "" + minibuffer-completion-table + minibuffer-completion-predicate + t))) + (if (listp def) + (append def all) + (setq all (cons def (delete def all)))))) + (defun goto-history-element (nabs) "Puts element of the minibuffer history in the minibuffer. The argument NABS specifies the absolute history position." (interactive "p") + (when (and (functionp minibuffer-default-set-function) + (< nabs (if (stringp minibuffer-default) -1 0))) + (setq minibuffer-default (funcall minibuffer-default-set-function) + minibuffer-default-set-function nil)) (let ((minimum (if minibuffer-default (- (if (listp minibuffer-default) (length minibuffer-default) -- Juri Linkov http://www.jurta.org/emacs/