aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/ChangeLog9
-rw-r--r--src/fileio.c2
2 files changed, 9 insertions, 2 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index 6820cdfe06a..6bec8c3b044 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,12 @@
12005-06-24 Eli Zaretskii <eliz@gnu.org>
2
3 * fileio.c (Frename_file): Undo last change: no need to ifdef away
4 chown on DOS_NT platforms.
5
6 * w32.c (sys_chown): New function.
7
8 * s/ms-w32.h (chown): New; define to sys_chown.
9
12005-06-24 Juanma Barranquero <lekktu@gmail.com> 102005-06-24 Juanma Barranquero <lekktu@gmail.com>
2 11
3 * xdisp.c (syms_of_xdisp) <nobreak-char-display>: Doc fix. 12 * xdisp.c (syms_of_xdisp) <nobreak-char-display>: Doc fix.
diff --git a/src/fileio.c b/src/fileio.c
index 2fb12959786..6bdc030bc6c 100644
--- a/src/fileio.c
+++ b/src/fileio.c
@@ -2789,11 +2789,9 @@ This is what happens in interactive use with M-x. */)
2789 NILP (ok_if_already_exists) ? Qnil : Qt, 2789 NILP (ok_if_already_exists) ? Qnil : Qt,
2790 Qt, Qnil); 2790 Qt, Qnil);
2791 2791
2792#ifndef DOS_NT
2793 /* Preserve owner and group, if possible (if we are root). */ 2792 /* Preserve owner and group, if possible (if we are root). */
2794 if (stat (SDATA (encoded_file), &data) >= 0) 2793 if (stat (SDATA (encoded_file), &data) >= 0)
2795 chown (SDATA (encoded_file), data.st_uid, data.st_gid); 2794 chown (SDATA (encoded_file), data.st_uid, data.st_gid);
2796#endif
2797 2795
2798 Fdelete_file (file); 2796 Fdelete_file (file);
2799 } 2797 }