aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRichard M. Stallman2003-05-16 18:50:24 +0000
committerRichard M. Stallman2003-05-16 18:50:24 +0000
commitb4bd27c59aea9c2b45aeb1caef8fca55bf0c8bc7 (patch)
tree5d5b32e14563bec29404c9f8b55b5c1c82b39326
parentace41f7d6ec1bd6dfe2f43c0f4a1ab12327db789 (diff)
downloademacs-b4bd27c59aea9c2b45aeb1caef8fca55bf0c8bc7.tar.gz
emacs-b4bd27c59aea9c2b45aeb1caef8fca55bf0c8bc7.zip
(Fdelete_file): Handle symlinks pointing to directories.
-rw-r--r--src/ChangeLog5
-rw-r--r--src/fileio.c3
2 files changed, 7 insertions, 1 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index 1ff5c7cedf4..5a67533e82b 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
12003-05-16 Ralph Schleicher <rs@nunatak.allgaeu.org> (tiny change)
2
3 * fileio.c (Fdelete_file): Handle symlinks pointing to
4 directories.
5
12003-05-15 Stefan Monnier <monnier@cs.yale.edu> 62003-05-15 Stefan Monnier <monnier@cs.yale.edu>
2 7
3 * keyboard.c (apply_modifiers): Don't fill the other cache. 8 * 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. */)
2623 struct gcpro gcpro1; 2623 struct gcpro gcpro1;
2624 2624
2625 GCPRO1 (filename); 2625 GCPRO1 (filename);
2626 if (!NILP (Ffile_directory_p (filename))) 2626 if (!NILP (Ffile_directory_p (filename))
2627 && NILP (Ffile_symlink_p (filename)))
2627 Fsignal (Qfile_error, 2628 Fsignal (Qfile_error,
2628 Fcons (build_string ("Removing old name: is a directory"), 2629 Fcons (build_string ("Removing old name: is a directory"),
2629 Fcons (filename, Qnil))); 2630 Fcons (filename, Qnil)));