]> git.eshelyaron.com Git - emacs.git/commit
(dired-insert-directory): Obey `file-list` and `wildcard`
authorStefan Monnier <monnier@iro.umontreal.ca>
Sun, 10 Dec 2023 03:55:32 +0000 (22:55 -0500)
committerEshel Yaron <me@eshelyaron.com>
Thu, 21 Dec 2023 20:50:59 +0000 (21:50 +0100)
commit654abc3d588e2f204fbf835f16d9ae35cc9ff64d
tree7feed96ed6abc02f0c2cbda8abe1fc2ce13afa0c
parent8bc521bf202e8a378681310eddb7bf58dd2587ab
(dired-insert-directory): Obey `file-list` and `wildcard`

Commit 6f6639d6ed6c's support for wildcards in directories failed
to obey `file-list` and `wildcard` arguments.  Fix it.

* lisp/dired.el (dired-insert-directory): Expand directory wildcards
only if `file-list` is nil and `wildcard` is non-nil.
Also, refer back to `dir-wildcard` instead of recomputing it.
(dired-readin-insert): Pass a non-nil `wildcard` when wildcard
expansion might be needed to preserve former behavior.

(cherry picked from commit f7cf85c3879c6857e8478bef41cce25a94759fb8)
lisp/dired.el
test/lisp/dired-tests.el