From: Richard M. Stallman <rms@gnu.org>
Date: Fri, 16 May 2003 18:50:24 +0000 (+0000)
Subject: (Fdelete_file): Handle symlinks pointing to directories.
X-Git-Tag: ttn-vms-21-2-B4~10140
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=b4bd27c59aea9c2b45aeb1caef8fca55bf0c8bc7;p=emacs.git

(Fdelete_file): Handle symlinks pointing to directories.
---

diff --git a/src/ChangeLog b/src/ChangeLog
index 1ff5c7cedf4..5a67533e82b 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+2003-05-16  Ralph Schleicher  <rs@nunatak.allgaeu.org>  (tiny change)
+
+	* fileio.c (Fdelete_file): Handle symlinks pointing to
+	directories.
+
 2003-05-15  Stefan Monnier  <monnier@cs.yale.edu>
 
 	* keyboard.c (apply_modifiers): Don't fill the other cache.
diff --git a/src/fileio.c b/src/fileio.c
index cfaf5738a5e..c84298cdaf1 100644
--- a/src/fileio.c
+++ b/src/fileio.c
@@ -2623,7 +2623,8 @@ If file has multiple names, it continues to exist with the other names.  */)
   struct gcpro gcpro1;
 
   GCPRO1 (filename);
-  if (!NILP (Ffile_directory_p (filename)))
+  if (!NILP (Ffile_directory_p (filename))
+      && NILP (Ffile_symlink_p (filename)))
     Fsignal (Qfile_error,
  	     Fcons (build_string ("Removing old name: is a directory"),
  		    Fcons (filename, Qnil)));