Fix 'dired-goto-file' in Dired buffers produced by find-dired

* lisp/dired.el (dired-goto-file): Try looking for the file as a
relative name with leading sub-directories, before looking for the
basename alone.  (Bug#23089)

1 files changed, 12 insertions, 3 deletions

diff --git a/lisp/dired.el b/lisp/dired.el
index ef22d457bca..5741872cfc8 100644
--- a/lisp/dired.el
+++ b/lisp/dired.el
@@ -2736,9 +2736,18 @@ instead of `dired-actual-switches'."
                  (save-excursion
                    (goto-char (point-min))
                    (dired-goto-file-1 file file (point-max)))
-                 ;; Otherwise, look for it as a relative name.  The
-                 ;; hair is to get the result of `dired-goto-subdir'
-                 ;; without calling it if we don't have any subdirs.
+                 ;; Next, look for it as a relative name with leading
+                 ;; subdirectories.  (This happens in Dired buffers
+                 ;; created by find-dired, for example.)
+                 (save-excursion
+                   (goto-char (point-min))
+                   (dired-goto-file-1 (file-relative-name file
+                                                          default-directory)
+                                      file (point-max)))
+                 ;; Otherwise, look for it as a relative name, a base
+                 ;; name only.  The hair is to get the result of
+                 ;; `dired-goto-subdir' without calling it if we don't
+                 ;; have any subdirs.
                  (save-excursion
                    (when (if (string= dir (expand-file-name default-directory))
                              (goto-char (point-min))