master d4503ccc276 1/2: image-dired-show-all-from-dir: Reuse dired's default-directory

[Stefan Kangas]

branch: master
commit d4503ccc2769035184e474542fc6c1df7e908ae0
Author: Sacha Chua <sacha@sachachua.com>
Commit: Stefan Kangas <stefankangas@gmail.com>

    image-dired-show-all-from-dir: Reuse dired's default-directory
    
    * lisp/image/image-dired.el (image-dired-show-all-from-dir): Delegate
    figuring out default-directory to dired.  This handles the case where
    image-dired is called with a cons cell that has a directory in the car
    and a list of files in the cdr, which dired can handle, and therefore
    allows image-dired-show-all-from-dir to show an arbitrary list of
    images.  It also means that image-dired-show-all-from-dir can handle
    wildcards.
    Ref: https://lists.gnu.org/r/emacs-devel/2025-01/msg00048.html
---
 lisp/image/image-dired.el | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/lisp/image/image-dired.el b/lisp/image/image-dired.el
index 71c272e4388..de548c6c729 100644
--- a/lisp/image/image-dired.el
+++ b/lisp/image/image-dired.el
@@ -630,7 +630,8 @@ never ask for confirmation."
   (interactive "DShow thumbnails for directory: ")
   (dired dir)
   (dired-mark-files-regexp (image-dired--file-name-regexp))
-  (let ((files (dired-get-marked-files nil nil nil t)))
+  (let ((files (dired-get-marked-files nil nil nil t))
+        (dired-default-directory default-directory))
     (cond ((and (null (cdr files)))
            (message "No image files in directory"))
           ((or (not image-dired-show-all-from-dir-max-files)
@@ -644,7 +645,7 @@ never ask for confirmation."
            (let ((inhibit-message t))
              (dired-unmark-all-marks))
            (pop-to-buffer image-dired-thumbnail-buffer)
-           (setq default-directory dir)
+           (setq default-directory dired-default-directory)
            (image-dired--update-header-line))
           (t (message "Image-Dired canceled")))))