* insdel.c (prepare_to_modify_buffer): For an indirect buffer, do

	clash detection using the base buffer.

diff --git a/src/ChangeLog b/src/ChangeLog
index 2a5e7afa99a1db43213136511aac1c5eadf6d723..d91bee1cb1c809f468d3372816734fd2fce4e778 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,5 +1,8 @@
 2006-07-05  Chong Yidong  <cyd@stupidchicken.com>
 
+       * insdel.c (prepare_to_modify_buffer): For an indirect buffer, do
+       clash detection using the base buffer.
+
        * puresize.h (BASE_PURESIZE): Increment to 1210500.
 
 2006-07-04  Kim F. Storm  <storm@cua.dk>

diff --git a/src/insdel.c b/src/insdel.c
index b9d9574788e7106e33c3ed7d24d2c7d57d585016..b97539c1cc2d062132ae10e0291e3beb91194d7e 100644 (file)
--- a/src/insdel.c
+++ b/src/insdel.c
@@ -2031,6 +2031,8 @@ prepare_to_modify_buffer (start, end, preserve_ptr)
      int start, end;
      int *preserve_ptr;
 {
+  struct buffer *base_buffer;
+
   if (!NILP (current_buffer->read_only))
     Fbarf_if_buffer_read_only ();
 
@@ -2056,20 +2058,26 @@ prepare_to_modify_buffer (start, end, preserve_ptr)
        verify_interval_modification (current_buffer, start, end);
     }
 
+  /* For indirect buffers, use the base buffer to check clashes.  */
+  if (current_buffer->base_buffer != 0)
+    base_buffer = current_buffer->base_buffer;
+  else
+    base_buffer = current_buffer;
+
 #ifdef CLASH_DETECTION
-  if (!NILP (current_buffer->file_truename)
+  if (!NILP (base_buffer->file_truename)
       /* Make binding buffer-file-name to nil effective.  */
-      && !NILP (current_buffer->filename)
+      && !NILP (base_buffer->filename)
       && SAVE_MODIFF >= MODIFF)
-    lock_file (current_buffer->file_truename);
+    lock_file (base_buffer->file_truename);
 #else
   /* At least warn if this file has changed on disk since it was visited.  */
-  if (!NILP (current_buffer->filename)
+  if (!NILP (base_buffer->filename)
       && SAVE_MODIFF >= MODIFF
       && NILP (Fverify_visited_file_modtime (Fcurrent_buffer ()))
-      && !NILP (Ffile_exists_p (current_buffer->filename)))
+      && !NILP (Ffile_exists_p (base_buffer->filename)))
     call1 (intern ("ask-user-about-supersession-threat"),
-          current_buffer->filename);
+          base_buffer->filename);
 #endif /* not CLASH_DETECTION */
 
   signal_before_change (start, end, preserve_ptr);