[Emacs-diffs] emacs/lisp ChangeLog files.el

[Chong Yidong]

CVSROOT:        /sources/emacs
Module name:    emacs
Changes by:     Chong Yidong <cyd>      09/10/24 20:30:48

Modified files:
        lisp           : ChangeLog files.el 

Log message:
        * files.el (delete-directory): Delete symlinks to directories with
        delete-file (Bug#4739).

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/ChangeLog?cvsroot=emacs&r1=1.16501&r2=1.16502
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/files.el?cvsroot=emacs&r1=1.1094&r2=1.1095

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/emacs/emacs/lisp/ChangeLog,v
retrieving revision 1.16501
retrieving revision 1.16502
diff -u -b -r1.16501 -r1.16502
--- ChangeLog   24 Oct 2009 18:02:47 -0000      1.16501
+++ ChangeLog   24 Oct 2009 20:30:44 -0000      1.16502
@@ -1,3 +1,8 @@
+2009-10-24  Sven Joachim  <address@hidden>
+
+       * files.el (delete-directory): Delete symlinks to directories with
+       delete-file (Bug#4739).
+
 2009-10-24  Chong Yidong  <address@hidden>
 
        * cedet/semantic/util.el (semantic-recursive-find-nonterminal-by-name):

Index: files.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/files.el,v
retrieving revision 1.1094
retrieving revision 1.1095
diff -u -b -r1.1094 -r1.1095
--- files.el    21 Oct 2009 20:04:02 -0000      1.1094
+++ files.el    24 Oct 2009 20:30:48 -0000      1.1095
@@ -4660,7 +4660,10 @@
       (if (and recursive (not (file-symlink-p directory)))
          (mapc
           (lambda (file)
-            (if (file-directory-p file)
+            ;; This test is equivalent to
+            ;; (and (file-directory-p fn) (not (file-symlink-p fn)))
+            ;; but more efficient
+            (if (eq t (car (file-attributes file)))
                 (delete-directory file recursive)
               (delete-file file)))
           ;; We do not want to delete "." and "..".