diff options
| author | Glenn Morris <rgm@gnu.org> | 2014-03-25 21:14:44 -0400 |
|---|---|---|
| committer | Glenn Morris <rgm@gnu.org> | 2014-03-25 21:14:44 -0400 |
| commit | 11ee65afc20d41f1fc31fe2ead84b2203b4bfeb0 (patch) | |
| tree | a3ae87b8d8d73968f293973444fbf3ae753d83f1 /src/insdel.c | |
| parent | defd53bdc5ef9d75fa112487d76f4d7a4cb9fe92 (diff) | |
| download | emacs-11ee65afc20d41f1fc31fe2ead84b2203b4bfeb0.tar.gz emacs-11ee65afc20d41f1fc31fe2ead84b2203b4bfeb0.tar.bz2 emacs-11ee65afc20d41f1fc31fe2ead84b2203b4bfeb0.zip | |
Remove the build-time option CLASH_DETECTION
Every platform supports it, and the runtime option `create-lockfiles'
replaces it.
* configure.ac (CLASH_DETECTION): Remove option.
* lisp/files.el (lock-buffer, unlock-buffer, file-locked-p):
Remove fallback aliases, since they are always defined now.
* src/buffer.c (Frestore_buffer_modified_p, Fkill_buffer):
* src/emacs.c (shut_down_emacs):
* src/fileio.c (Finsert_file_contents, write_region):
* src/filelock.c (top-level, syms_of_filelock):
* src/insdel.c (prepare_to_modify_buffer_1):
CLASH_DETECTION is always defined now.
* admin/CPP-DEFINES: Remove CLASH_DETECTION.
Diffstat (limited to 'src/insdel.c')
| -rw-r--r-- | src/insdel.c | 14 |
1 files changed, 2 insertions, 12 deletions
diff --git a/src/insdel.c b/src/insdel.c index 1c9bafd6004..5bd97f98613 100644 --- a/src/insdel.c +++ b/src/insdel.c @@ -1,6 +1,6 @@ /* Buffer insertion/deletion and gap motion for GNU Emacs. - Copyright (C) 1985-1986, 1993-1995, 1997-2014 Free Software - Foundation, Inc. + +Copyright (C) 1985-1986, 1993-1995, 1997-2014 Free Software Foundation, Inc. This file is part of GNU Emacs. @@ -1829,21 +1829,11 @@ prepare_to_modify_buffer_1 (ptrdiff_t start, ptrdiff_t end, else base_buffer = current_buffer; -#ifdef CLASH_DETECTION if (!NILP (BVAR (base_buffer, file_truename)) /* Make binding buffer-file-name to nil effective. */ && !NILP (BVAR (base_buffer, filename)) && SAVE_MODIFF >= MODIFF) lock_file (BVAR (base_buffer, file_truename)); -#else - /* At least warn if this file has changed on disk since it was visited. */ - if (!NILP (BVAR (base_buffer, filename)) - && SAVE_MODIFF >= MODIFF - && NILP (Fverify_visited_file_modtime (Fcurrent_buffer ())) - && !NILP (Ffile_exists_p (BVAR (base_buffer, filename)))) - call1 (intern ("ask-user-about-supersession-threat"), - BVAR (base_buffer,filename)); -#endif /* not CLASH_DETECTION */ /* If `select-active-regions' is non-nil, save the region text. */ /* FIXME: Move this to Elisp (via before-change-functions). */ |