procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

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

Browse source 
clash detection using the base buffer.
This commit is contained in:
Chong Yidong 2006-07-05 16:05:02 +00:00
parent e2e6e4d2fa
commit 234fb7734a
2 changed files with 17 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/ChangeLog
View file

@ -1,5 +1,8 @@
2006-07-05 Chong Yidong <cyd@stupidchicken.com> 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. * puresize.h (BASE_PURESIZE): Increment to 1210500.
2006-07-04 Kim F. Storm <storm@cua.dk> 2006-07-04 Kim F. Storm <storm@cua.dk>

20
src/insdel.c
View file

@ -2031,6 +2031,8 @@ prepare_to_modify_buffer (start, end, preserve_ptr)
int start, end; int start, end;
int *preserve_ptr; int *preserve_ptr;
{ {
struct buffer *base_buffer;
if (!NILP (current_buffer->read_only)) if (!NILP (current_buffer->read_only))
Fbarf_if_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); 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 #ifdef CLASH_DETECTION
if (!NILP (current_buffer->file_truename) if (!NILP (base_buffer->file_truename)
/* Make binding buffer-file-name to nil effective. */ /* Make binding buffer-file-name to nil effective. */
&& !NILP (current_buffer->filename) && !NILP (base_buffer->filename)
&& SAVE_MODIFF >= MODIFF) && SAVE_MODIFF >= MODIFF)
lock_file (current_buffer->file_truename); lock_file (base_buffer->file_truename);
#else #else
/* At least warn if this file has changed on disk since it was visited. */ /* 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 && SAVE_MODIFF >= MODIFF
&& NILP (Fverify_visited_file_modtime (Fcurrent_buffer ())) && 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"), call1 (intern ("ask-user-about-supersession-threat"),
current_buffer->filename); base_buffer->filename);
#endif /* not CLASH_DETECTION */ #endif /* not CLASH_DETECTION */
signal_before_change (start, end, preserve_ptr); signal_before_change (start, end, preserve_ptr);