summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLars Ingebrigtsen <larsi@gnus.org>2022-06-10 10:19:15 +0200
committerLars Ingebrigtsen <larsi@gnus.org>2022-06-10 10:22:33 +0200
commit7ee736a884766f2017a934d936bfbfa4c70b5099 (patch)
treedb20352c52973fa4b8c2e1be824d8025fdc5304b
parent49e06183f5972817d93dad6acf5351c204e61cc5 (diff)
downloademacs-7ee736a884766f2017a934d936bfbfa4c70b5099.tar.gz
Allow specifying a wildcard argument to list-directory again
* lisp/files.el (list-directory): Allow specifying a wildcard argument interactively again (bug#55877).
-rw-r--r--lisp/files.el5
1 files changed, 2 insertions, 3 deletions
diff --git a/lisp/files.el b/lisp/files.el
index 5f4c4fa0176..8836ee6fb21 100644
--- a/lisp/files.el
+++ b/lisp/files.el
@@ -7386,12 +7386,11 @@ and `list-directory-verbose-switches'."
(list (read-file-name
(if pfx "List directory (verbose): "
"List directory (brief): ")
- nil default-directory t
- nil
+ nil default-directory
(lambda (file)
(or (file-directory-p file)
(insert-directory-wildcard-in-dir-p
- (expand-file-name file)))))
+ (file-name-as-directory (expand-file-name file))))))
pfx)))
(let ((switches (if verbose list-directory-verbose-switches
list-directory-brief-switches))