From: Richard M. Stallman <rms@gnu.org>
Date: Fri, 13 May 2005 23:09:41 +0000 (+0000)
Subject: (Finsert_file_contents): Fix previous change.
X-Git-Tag: ttn-vms-21-2-B4~336
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=6840d3505d26ba586cc8b9b07441299efd642050;p=emacs.git

(Finsert_file_contents): Fix previous change.
---

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;
     }