diff options
| author | Glenn Morris <rgm@gnu.org> | 2011-02-19 10:55:15 -0800 |
|---|---|---|
| committer | Glenn Morris <rgm@gnu.org> | 2011-02-19 10:55:15 -0800 |
| commit | 429242317e3abaa40dad9f3d2a9eb537cd0fd9b3 (patch) | |
| tree | 7d993e586781cd40c5c215891054a6c87926c8c2 /lisp/dired-x.el | |
| parent | 56e96bed349771df1df56546450a21afc75c00d3 (diff) | |
| download | emacs-429242317e3abaa40dad9f3d2a9eb537cd0fd9b3.tar.gz | |
Merge dired-x's dired-clean-up-after-deletion into dired's version.
* lisp/dired-x.el (dired-clean-up-after-deletion): Merge into dired.el.
* lisp/dired.el (dired-clean-up-after-deletion): Merge dired-x's version.
(dired-clean-up-buffers-too): Declare.
* doc/misc/dired-x.texi (Technical Details):
No longer redefine dired-clean-up-after-deletion.
Diffstat (limited to 'lisp/dired-x.el')
| -rw-r--r-- | lisp/dired-x.el | 28 |
1 files changed, 1 insertions, 27 deletions
diff --git a/lisp/dired-x.el b/lisp/dired-x.el index 901614e49d0..1810d59712d 100644 --- a/lisp/dired-x.el +++ b/lisp/dired-x.el @@ -48,7 +48,7 @@ ;; User customization: M-x customize-group RET dired-x RET. ;; When loaded this code redefines the following functions of GNU Emacs: -;; From dired.el: dired-clean-up-after-deletion, dired-find-buffer-nocreate. +;; From dired.el: dired-find-buffer-nocreate. ;; From dired-aux.el: dired-read-shell-command. ;; *Please* see the `dired-x' info pages for more details. @@ -323,32 +323,6 @@ See also the functions: (dired-omit-startup)) -;;; BUFFER CLEANING. - -;; REDEFINE. -(defun dired-clean-up-after-deletion (fn) - "Clean up after a deleted file or directory FN. -Remove expanded subdir of deleted dir, if any." - (save-excursion (and (cdr dired-subdir-alist) - (dired-goto-subdir fn) - (dired-kill-subdir))) - ;; Offer to kill buffer of deleted file FN. - (when dired-clean-up-buffers-too - (let ((buf (get-file-buffer fn))) - (and buf - (funcall #'y-or-n-p - (format "Kill buffer of %s, too? " - (file-name-nondirectory fn))) - (kill-buffer buf))) - (let ((buf-list (dired-buffers-for-dir (expand-file-name fn)))) - (and buf-list - (y-or-n-p (format "Kill dired buffer%s of %s, too? " - (dired-plural-s (length buf-list)) - (file-name-nondirectory fn))) - (dolist (buf buf-list) - (kill-buffer buf)))))) - - ;;; EXTENSION MARKING FUNCTIONS. ;; Mark files with some extension. |