emacs-diffs
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Emacs-diffs] emacs/lisp dired.el


From: Michael Albinus
Subject: [Emacs-diffs] emacs/lisp dired.el
Date: Thu, 01 Oct 2009 15:01:33 +0000

CVSROOT:        /sources/emacs
Module name:    emacs
Changes by:     Michael Albinus <albinus>       09/10/01 15:01:32

Modified files:
        lisp           : dired.el 

Log message:
        *** empty log message ***

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/dired.el?cvsroot=emacs&r1=1.431&r2=1.432

Patches:
Index: dired.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/dired.el,v
retrieving revision 1.431
retrieving revision 1.432
diff -u -b -r1.431 -r1.432
--- dired.el    25 Sep 2009 04:35:17 -0000      1.431
+++ dired.el    1 Oct 2009 15:01:32 -0000       1.432
@@ -2526,23 +2526,19 @@
 `always', delete recursively without asking.
 `top', ask for each directory at top level.
 Anything else, ask for each sub-directory."
-  (let (files)
      ;; This test is equivalent to
      ;; (and (file-directory-p fn) (not (file-symlink-p fn)))
      ;; but more efficient
     (if (not (eq t (car (file-attributes file))))
        (delete-file file)
-      (when (and recursive
-              (setq files
-                    (directory-files file t dired-re-no-dot)) ; Not empty.
+    (if (and recursive
+            (directory-files file t dired-re-no-dot) ; Not empty.
               (or (eq recursive 'always)
                   (yes-or-no-p (format "Recursive delete of %s? "
                                        (dired-make-relative file)))))
        (if (eq recursive 'top) (setq recursive 'always)) ; Don't ask again.
-       (while files            ; Recursively delete (possibly asking).
-           (dired-delete-file (car files) recursive)
-           (setq files (cdr files))))
-      (delete-directory file))))
+      (setq recursive nil))
+    (delete-directory file recursive)))
 
 (defun dired-do-flagged-delete (&optional nomessage)
   "In Dired, delete the files flagged for deletion.




reply via email to

[Prev in Thread] Current Thread [Next in Thread]