[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
master 4e17560: Fix dired confirm message asking to kill buffers of dele
From: |
Tassilo Horn |
Subject: |
master 4e17560: Fix dired confirm message asking to kill buffers of deleted dir (bug#48301) |
Date: |
Tue, 11 May 2021 15:10:38 -0400 (EDT) |
branch: master
commit 4e175604b5b53f6892782e2bbf5bf60cb1b635f3
Author: Tassilo Horn <tsdh@gnu.org>
Commit: Tassilo Horn <tsdh@gnu.org>
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).
---
lisp/dired.el | 15 ++++++++++-----
1 file changed, 10 insertions(+), 5 deletions(-)
diff --git a/lisp/dired.el b/lisp/dired.el
index 11df93e..8527634 100644
--- 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))))))
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- master 4e17560: Fix dired confirm message asking to kill buffers of deleted dir (bug#48301),
Tassilo Horn <=