diff src/insdel.c @ 460:223736d75acb r21-2-45

Import from CVS: tag r21-2-45
author cvs
date Mon, 13 Aug 2007 11:43:24 +0200
parents abe6d1db359e
children 183866b06e0b
line wrap: on
line diff
--- a/src/insdel.c	Mon Aug 13 11:42:27 2007 +0200
+++ b/src/insdel.c	Mon Aug 13 11:43:24 2007 +0200
@@ -2324,16 +2324,15 @@
   if (!NILP (buf->filename) && lockit &&
       BUF_SAVE_MODIFF (buf) >= BUF_MODIFF (buf))
     {
-#ifdef CLASH_DETECTION
-      if (!NILP (buf->file_truename))
-	/* Make binding buffer-file-name to nil effective.  */
-	lock_file (buf->file_truename);
-#else
       /* At least warn if this file has changed on disk since it was visited.*/
       if (NILP (Fverify_visited_file_modtime (buffer))
 	  && !NILP (Ffile_exists_p (buf->filename)))
 	call1_in_buffer (buf, intern ("ask-user-about-supersession-threat"),
 			 buf->filename);
+#ifdef CLASH_DETECTION
+      if (!NILP (buf->file_truename))
+	/* Make binding buffer-file-name to nil effective.  */
+	lock_file (buf->file_truename);
 #endif /* not CLASH_DETECTION */
     }
   UNGCPRO;