]> git.eshelyaron.com Git - emacs.git/commitdiff
Allow specifying a wildcard argument to list-directory again
authorLars Ingebrigtsen <larsi@gnus.org>
Fri, 10 Jun 2022 08:19:15 +0000 (10:19 +0200)
committerLars Ingebrigtsen <larsi@gnus.org>
Fri, 10 Jun 2022 08:22:33 +0000 (10:22 +0200)
* lisp/files.el (list-directory): Allow specifying a wildcard
argument interactively again (bug#55877).

lisp/files.el

index 5f4c4fa01764b0fb8fa75f290e25e83746edb6d0..8836ee6fb216ee6880482073c530d69244be824d 100644 (file)
@@ -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))