(Finsert_file_contents): Fix previous change.

2 files changed, 2 insertions, 1 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index b89d61d2d52..70e78fd7731 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -51,7 +51,6 @@
         (unexec_malloc, unexec_realloc, unexec_free): Store and use
         allocated size information in unexec_malloc_header.
 
->>>>>>> 1.4385
 2005-05-10  Richard M. Stallman  <rms@gnu.org>
 
         * xterm.c (noinclude): Add #undef.
diff --git a/src/fileio.c b/src/fileio.c
index 6edcf45da50..0956fb9d134 100644
--- a/src/fileio.c
+++ b/src/fileio.c
@@ -4516,8 +4516,10 @@ actually used.  */)
 
   if (inserted == 0)
     {
+#ifdef CLASH_DETECTION
       if (we_locked_file)
         unlock_file (current_buffer->file_truename);
+#endif
       Vdeactivate_mark = old_Vdeactivate_mark;
     }