Fix dired confirm message asking to kill buffers of deleted dir (bug#48301)

* lisp/dired.el (dired-clean-up-after-deletion): Fix dired
confirmation message asking to kill buffers of deleted dir in the case
where `dired-listing-switches' contain -p (bug#48301).

diff --git a/lisp/dired.el b/lisp/dired.el
index 11df93ec3bb413eca0c0d45e248c15d9d31eeae3..8527634760a32b5e3488efc5ce60478e7ac45ccc 100644 (file)
--- a/lisp/dired.el
+++ b/lisp/dired.el
@@ -3425,11 +3425,16 @@ confirmation.  To disable the confirmation, see
     (let ((buf-list (dired-buffers-for-dir (expand-file-name fn))))
       (and buf-list
            (or (and dired-clean-confirm-killing-deleted-buffers
-                    (y-or-n-p (format
-                               (ngettext "Kill Dired buffer of %s, too? "
-                                         "Kill Dired buffers of %s, too? "
-                                         (length buf-list))
-                               (file-name-nondirectory fn))))
+                    (y-or-n-p
+                     (format
+                      (ngettext "Kill Dired buffer of %s, too? "
+                                "Kill Dired buffers of %s, too? "
+                                (length buf-list))
+                      (file-name-nondirectory
+                       ;; FN may end in a / if `dired-listing-switches'
+                       ;; contains -p, so we need to strip that
+                       ;; (bug#48301).
+                       (directory-file-name fn)))))
                (not dired-clean-confirm-killing-deleted-buffers))
            (dolist (buf buf-list)
              (kill-buffer buf))))))