diff options
author | Karoly Lorentey <[email protected]> | 2004-05-11 09:12:09 +0000 |
---|---|---|
committer | Karoly Lorentey <[email protected]> | 2004-05-11 09:12:09 +0000 |
commit | d9858e4f1889a61b216ae1f99053846362067ccc (patch) | |
tree | d0f18015bf1ebe06f489de11b74b4e4b5e98fdc3 /src/fileio.c | |
parent | ab4b17bed77ba635b5654accdfde3fbdf125f3e6 (diff) | |
parent | a57e8159253e6ddd74b0453de7c526a9895b9576 (diff) |
Merged in changes from CVS trunk.
Patches applied:
* [email protected]/emacs--cvs-trunk--0--patch-291
Update from CVS
* [email protected]/emacs--cvs-trunk--0--patch-292
Update from CVS
* [email protected]/emacs--cvs-trunk--0--patch-293
Update from CVS
* [email protected]/emacs--cvs-trunk--0--patch-294
Update from CVS
* [email protected]/emacs--cvs-trunk--0--patch-295
Update from CVS
* [email protected]/emacs--cvs-trunk--0--patch-296
Allow restarting an existing debugger session that's exited
* [email protected]/emacs--cvs-trunk--0--patch-297
Update from CVS
* [email protected]/emacs--cvs-trunk--0--patch-298
Update from CVS
git-archimport-id: [email protected]/emacs--multi-tty--0--patch-162
Diffstat (limited to 'src/fileio.c')
-rw-r--r-- | src/fileio.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/fileio.c b/src/fileio.c index bd84ce6121..6be8cbe18f 100644 --- a/src/fileio.c +++ b/src/fileio.c @@ -1,5 +1,5 @@ /* File IO for GNU Emacs. - Copyright (C) 1985,86,87,88,93,94,95,96,97,98,99,2000,01,2003 + Copyright (C) 1985,86,87,88,93,94,95,96,97,98,99,2000,01,03,2004 Free Software Foundation, Inc. This file is part of GNU Emacs. @@ -2731,7 +2731,7 @@ This is what happens in interactive use with M-x. */) symlink_target = Ffile_symlink_p (file); if (! NILP (symlink_target)) Fmake_symbolic_link (symlink_target, newname, - NILP (ok_if_already_exists) ? Qnil : Qt, Qt); + NILP (ok_if_already_exists) ? Qnil : Qt); else #endif Fcopy_file (file, newname, |