From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.io!.POSTED.blaine.gmane.org!not-for-mail From: Joseph Turner via "Bug reports for GNU Emacs, the Swiss army knife of text editors" Newsgroups: gmane.emacs.bugs Subject: bug#66224: [PATCH] Add optional PREDICATE argument to read-directory-name Date: Sat, 13 Jan 2024 11:26:25 -0800 Message-ID: <87r0ilav8m.fsf@breatheoutbreathe.in> References: <877coch0q7.fsf@breatheoutbreathe.in> <874jje1xds.fsf@posteo.net> <87bkdly7t4.fsf@breatheoutbreathe.in> <871qehr5vs.fsf@web.de> <877co9y5jt.fsf@breatheoutbreathe.in> <877co4tmav.fsf@web.de> <87bkdf47g5.fsf@breatheoutbreathe.in> <87pm1t3lqx.fsf@web.de> <87v8blzw89.fsf@breatheoutbreathe.in> <87il66og65.fsf@breatheoutbreathe.in> Reply-To: Joseph Turner Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="=-=-=" Injection-Info: ciao.gmane.io; posting-host="blaine.gmane.org:116.202.254.214"; logging-data="7262"; mail-complaints-to="usenet@ciao.gmane.io" Cc: michael_heerdegen@web.de, philipk@posteo.net, 66224@debbugs.gnu.org To: Stefan Kangas Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane-mx.org@gnu.org Sat Jan 13 20:29:25 2024 Return-path: Envelope-to: geb-bug-gnu-emacs@m.gmane-mx.org Original-Received: from lists.gnu.org ([209.51.188.17]) by ciao.gmane.io with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1rOjh6-0001jw-IS for geb-bug-gnu-emacs@m.gmane-mx.org; Sat, 13 Jan 2024 20:29:24 +0100 Original-Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rOjgo-0001FA-3F; Sat, 13 Jan 2024 14:29:06 -0500 Original-Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rOjgl-0001F0-FI for bug-gnu-emacs@gnu.org; Sat, 13 Jan 2024 14:29:04 -0500 Original-Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1rOjgl-0006TM-6f for bug-gnu-emacs@gnu.org; Sat, 13 Jan 2024 14:29:03 -0500 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rOjgj-0003o8-Su for bug-gnu-emacs@gnu.org; Sat, 13 Jan 2024 14:29:01 -0500 X-Loop: help-debbugs@gnu.org Resent-From: Joseph Turner Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Sat, 13 Jan 2024 19:29:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 66224 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: patch Original-Received: via spool by 66224-submit@debbugs.gnu.org id=B66224.170517411214597 (code B ref 66224); Sat, 13 Jan 2024 19:29:01 +0000 Original-Received: (at 66224) by debbugs.gnu.org; 13 Jan 2024 19:28:32 +0000 Original-Received: from localhost ([127.0.0.1]:41165 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rOjgG-0003nM-4v for submit@debbugs.gnu.org; Sat, 13 Jan 2024 14:28:32 -0500 Original-Received: from out-177.mta1.migadu.com ([95.215.58.177]:64672) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rOjgC-0003nB-Vg for 66224@debbugs.gnu.org; Sat, 13 Jan 2024 14:28:30 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=breatheoutbreathe.in; s=key1; t=1705174108; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=mXRe+v/epM0QEzhHcyyDE8hiqD1+H2STDTUjxxKUqYc=; b=Gj+kSWbM8XrK8TpxnU+ZDtA+e7uoGo5QlrqYtpm6sZf/O2WS3oG4PZMei0M5S3yIzi78KT Z3IouC8Cf/yZJyyABpxEdDAf7lO9twhYDmc+3virTmi6oacoRmFh5t1oiRr0PrX81U6nwC kruGFG2EJb0IKEOO0+tK+fFcyWiZvQQ= X-Report-Abuse: Please report any abuse attempt to abuse@migadu.com and include these headers. In-reply-to: X-Migadu-Flow: FLOW_OUT X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list 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: , Errors-To: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane-mx.org@gnu.org Original-Sender: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane-mx.org@gnu.org Xref: news.gmane.io gmane.emacs.bugs:278154 Archived-At: --=-=-= Content-Type: text/plain Stefan Kangas writes: > Joseph Turner writes: > >> Joseph Turner writes: >> >>> Michael Heerdegen writes: >>> >>>> Joseph Turner via "Bug reports for GNU Emacs, the Swiss army knife of >>>> text editors" writes: >>>> >>>>> I'm not sure what you mean. In both of the following examples, PREDICATE >>>>> is used to narrow the completion candidates to only empty directories: >>>>> >>>>> (read-directory-name "Prompt: " "~/" nil t nil #'directory-empty-p) >>>>> (read-directory-name "Prompt: " "~/" nil nil nil #'directory-empty-p) >>>> >>>> In the second version also non-empty directories will be accepted. >>> >>> Yes, PREDICATE narrows the completion candidates but doesn't determine a >>> valid return value. >> >> Ping! I'm happy to keep discussing this patch if others are interested. > > Could you please send the latest version of your patch? Here you go! --=-=-= Content-Type: text/x-diff Content-Disposition: inline; filename=0001-Add-optional-PREDICATE-argument-to-read-directory-na.patch >From 894e44bce60cf30c9e8bc8c5323eaed91d135bbb Mon Sep 17 00:00:00 2001 From: Joseph Turner Date: Thu, 28 Sep 2023 20:27:47 -0700 Subject: [PATCH] Add optional PREDICATE argument to read-directory-name * lisp/files.el (read-directory-name): Add optional PREDICATE arg. * doc/lispref/minibuf.texi (Reading File Names): Document change. * etc/NEWS: Note change. --- doc/lispref/minibuf.texi | 7 +++++-- etc/NEWS | 5 +++++ lisp/files.el | 13 ++++++++++--- 3 files changed, 20 insertions(+), 5 deletions(-) diff --git a/doc/lispref/minibuf.texi b/doc/lispref/minibuf.texi index 620c58ec6e9..bf4d6e13d3a 100644 --- a/doc/lispref/minibuf.texi +++ b/doc/lispref/minibuf.texi @@ -1709,7 +1709,7 @@ If this variable is non-@code{nil}, @code{read-file-name} ignores case when performing completion. @end defopt -@defun read-directory-name prompt &optional directory default require-match initial +@defun read-directory-name prompt &optional directory default require-match initial predicate This function is like @code{read-file-name} but allows only directory names as completion alternatives. @@ -1719,7 +1719,10 @@ combining @var{directory} (or the current buffer's default directory if @var{directory} is @code{nil}) and @var{initial}. If both @var{default} and @var{initial} are @code{nil}, this function uses @var{directory} as substitute default, or the current buffer's default -directory if @var{directory} is @code{nil}. +directory if @var{directory} is @code{nil}. When optional sixth +argument @code{predicate} is non-nil, the union of @code{predicate} +and @code{file-directory-p} is passed as the @code{predicate} argument +to @code{read-file-name}. @end defun @defopt insert-default-directory diff --git a/etc/NEWS b/etc/NEWS index 1b3532b5657..fb9f6a0b43f 100644 --- a/etc/NEWS +++ b/etc/NEWS @@ -3541,6 +3541,11 @@ This function is called to see whether what the user has typed is a match. This is also available from functions that call 'completing-read', like 'read-file-name'. +** 'read-directory-name' now accepts an optional PREDICATE argument. +When optional sixth argument PREDICATE is non-nil, the union of +PREDICATE and 'file-directory-p' is passed as the PREDICATE argument +to 'read-file-name'. + ** 'posn-col-row' can now give position data based on windows. Previously, it reported data only based on the frame. diff --git a/lisp/files.el b/lisp/files.el index b72f141c0ee..68855cd1c6d 100644 --- a/lisp/files.el +++ b/lisp/files.el @@ -807,7 +807,7 @@ See Info node `(elisp)Standard File Names' for more details." (dos-convert-standard-filename filename)) (t filename))) -(defun read-directory-name (prompt &optional dir default-dirname mustmatch initial) +(defun read-directory-name (prompt &optional dir default-dirname mustmatch initial predicate) "Read directory name, prompting with PROMPT and completing in directory DIR. Value is not expanded---you must call `expand-file-name' yourself. Default name to DEFAULT-DIRNAME if user exits with the same @@ -821,14 +821,21 @@ Fourth arg MUSTMATCH non-nil means require existing directory's name. Non-nil and non-t means also require confirmation after completion. Fifth arg INITIAL specifies text to start with. DIR should be an absolute directory name. It defaults to -the value of `default-directory'." +the value of `default-directory'. +When sixth arg PREDICATE is non-nil, the union of PREDICATE and +`file-directory-p' is passed as the PREDICATE argument to +`read-file-name'. Otherwise, only `file-directory-p' is passed." (unless dir (setq dir default-directory)) (read-file-name prompt dir (or default-dirname (if initial (expand-file-name initial dir) dir)) mustmatch initial - 'file-directory-p)) + (if predicate + (lambda (filename) + (and (file-directory-p filename) + (funcall predicate filename))) + #'file-directory-p))) (defun pwd (&optional insert) -- 2.41.0 --=-=-=--