Mercurial > hg > xemacs-beta
changeset 758:760db937b9ee
[xemacs-hg @ 2002-02-22 17:22:00 by michaels]
2001-09-04 Daiki Ueno <ueno@unixuser.org>
* insdel.c (prepare_to_modify_buffer): Don't call the function
ask-user-about-supersession-threat when CLASH_DETECTION is set.
| author | michaels |
|---|---|
| date | Fri, 22 Feb 2002 17:22:02 +0000 |
| parents | 516c347c4479 |
| children | 7b0e9f17fcf0 |
| files | src/ChangeLog src/insdel.c |
| diffstat | 2 files changed, 10 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/src/ChangeLog Fri Feb 22 17:14:00 2002 +0000 +++ b/src/ChangeLog Fri Feb 22 17:22:02 2002 +0000 @@ -1,3 +1,8 @@ +2001-09-04 Daiki Ueno <ueno@unixuser.org> + + * insdel.c (prepare_to_modify_buffer): Don't call the function + ask-user-about-supersession-threat when CLASH_DETECTION is set. + 2002-02-13 Ben Wing <ben@xemacs.org> * event-stream.c (reset_key_echo):
--- a/src/insdel.c Fri Feb 22 17:14:00 2002 +0000 +++ b/src/insdel.c Fri Feb 22 17:22:02 2002 +0000 @@ -2324,15 +2324,16 @@ 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;