mirrors/emacs
1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2025-12-15 10:30:25 -08:00
Code Issues Projects Releases Wiki Activity

Use recursive-trash feature for eshell deletion (Bug#7011).

Browse source 
* lisp/eshell/em-unix.el (eshell-remove-entries): Use the TRASH
argument of delete-file and delete-directory (Bug#7011).
This commit is contained in:
Leo Liu 2010-10-24 13:24:24 -04:00 • committed by Chong Yidong
parent 947f5e0162
commit 59dd6f738c
2 changed files with 9 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

12
lisp/eshell/em-unix.el
View file

@ -203,13 +203,7 @@ Otherwise, Emacs will attempt to use rsh to invoke du on the remote machine."
(eshell-error "rm: cannot remove `.' or `..'\n"))
(if (and (file-directory-p (car files))
(not (file-symlink-p (car files))))
(let ((dir (file-name-as-directory (car files))))
(eshell-remove-entries dir
(mapcar
(function
(lambda (file)
(concat dir file)))
(directory-files dir)))
(progn
(if verbose
(eshell-printn (format "rm: removing directory `%s'"
(car files))))
@ -219,7 +213,7 @@ Otherwise, Emacs will attempt to use rsh to invoke du on the remote machine."
(not (y-or-n-p
(format "rm: remove directory `%s'? "
(car files))))))
(eshell-funcalln 'delete-directory (car files))))
(eshell-funcalln 'delete-directory (car files) t t)))
(if verbose
(eshell-printn (format "rm: removing file `%s'"
(car files))))
@ -228,7 +222,7 @@ Otherwise, Emacs will attempt to use rsh to invoke du on the remote machine."
(not (y-or-n-p
(format "rm: remove `%s'? "
(car files))))))
(eshell-funcalln 'delete-file (car files)))))
(eshell-funcalln 'delete-file (car files) t))))
(setq files (cdr files))))
(defun eshell/rm (&rest args)