mirror/emacs
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/emacs.git synced 2025-01-22 18:35:09 +00:00
Code Issues Releases Activity

Merge branch 'master' of git.savannah.gnu.org:/srv/git/emacs

Browse Source
This commit is contained in:
Eli Zaretskii 2022-07-03 15:39:05 +03:00
commit 18a2bc7a6e
3 changed files with 23 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
etc/NEWS
View File

@ -1044,6 +1044,16 @@ so automatically.
** Dired
---
*** 'dired-clean-up-buffers-too' moved from dired-x to dired.
This means that Dired now offers to kill buffers visiting files and
dirs when they are deleted in Dired. Before, you had to require
'dired-x' to enable this behavior. To disable this behavior,
customize the user option 'dired-clean-up-buffers-too' to nil. The
related user option 'dired-clean-confirm-killing-deleted-buffers'
(which see) has also been moved to 'dired'.
+++
*** 'dired-info' and 'dired-man' moved from dired-x to dired.
The 'dired-info' and 'dired-man' commands have been moved from the
'dired-x' package to 'dired'. They have also been renamed to
@ -1061,6 +1071,7 @@ the following to your Init file:
(keymap-set dired-mode-map "N" nil)
(keymap-set dired-mode-map "I" nil))
---
*** New command 'dired-do-eww'.
This command visits the file on the current line with EWW.

11
lisp/dired-x.el
View File

@ -230,17 +230,6 @@ to nil: a pipe using `zcat' or `gunzip -c' will be used."
(string :tag "Switches"))
:group 'dired-x)
(defcustom dired-clean-up-buffers-too t
"Non-nil means offer to kill buffers visiting files and dirs deleted in Dired."
:type 'boolean
:group 'dired-x)
(defcustom dired-clean-confirm-killing-deleted-buffers t
"If nil, don't ask whether to kill buffers visiting deleted files."
:version "26.1"
:type 'boolean
:group 'dired-x)
;;; Key bindings

16
lisp/dired.el
View File

@ -3692,13 +3692,21 @@ See `dired-delete-file' in case you wish that."
(dired-remove-entry file)
(dired-clean-up-after-deletion file))
(defvar dired-clean-up-buffers-too)
(defvar dired-clean-confirm-killing-deleted-buffers)
(defcustom dired-clean-up-buffers-too t
"Non-nil means offer to kill buffers visiting files and dirs deleted in Dired."
:type 'boolean
:group 'dired)
(defcustom dired-clean-confirm-killing-deleted-buffers t
"If nil, don't ask whether to kill buffers visiting deleted files."
:type 'boolean
:group 'dired
:version "26.1")
(defun dired-clean-up-after-deletion (fn)
"Clean up after a deleted file or directory FN.
Removes any expanded subdirectory of deleted directory. If
`dired-x' is loaded and `dired-clean-up-buffers-too' is non-nil,
Removes any expanded subdirectory of deleted directory.
If `dired-clean-up-buffers-too' is non-nil,
kill any buffers visiting those files, prompting for
confirmation. To disable the confirmation, see
`dired-clean-confirm-killing-deleted-buffers'."