bug#7011: 24.1; [PATCH] improve eshell-remove-entries

[Leo <sdl.web@gmail.com>]

On 2010-09-11 03:49 +0100, Leo wrote:
> eshell-remove-entries implements its own recursive delete of files in a
> directory and this does not play well with the move-to-trash feature.
> For example, if you use 'rm -rf' in eshell to delete a dir with hundreds
> of files in it (eg .git), you will get hundreds of files at the top
> level of the Trash bin.
>
> The following patch enables eshell-remove-entries to support
> move-to-trash feature and use delete-directory's RECURSIVE arg instead.
>
>
> diff --git a/lisp/eshell/em-unix.el b/lisp/eshell/em-unix.el
> index 6ceb591..e12e03c 100644
> --- a/lisp/eshell/em-unix.el
> +++ b/lisp/eshell/em-unix.el
> @@ -204,12 +204,6 @@ Otherwise, Emacs will attempt to use rsh to invoke du on the remote machine."
>        (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)))
>  	    (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)
>
>
> Leo

Also remove the unused let bound var dir.

diff --git a/lisp/eshell/em-unix.el b/lisp/eshell/em-unix.el
index e12e03c..f22cc4f 100644
--- a/lisp/eshell/em-unix.el
+++ b/lisp/eshell/em-unix.el
@@ -203,7 +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))))
+	  (progn
 	    (if verbose
 		(eshell-printn (format "rm: removing directory `%s'"
 				       (car files))))

Leo