(Finsert_file_contents): Fix previous change.

diff --git a/src/ChangeLog b/src/ChangeLog
index b89d61d2d520b2c17e828a7d890bd590da85547b..70e78fd773118d95402b9e0302d2466bda15811e 100644 (file)
--- 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 6edcf45da504b4057295b87a19c45da34a913fc8..0956fb9d13450a50f64a9fad7e33aa341474877b 100644 (file)
--- 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;
     }