From 11ee65afc20d41f1fc31fe2ead84b2203b4bfeb0 Mon Sep 17 00:00:00 2001 From: Glenn Morris Date: Tue, 25 Mar 2014 21:14:44 -0400 Subject: 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. --- admin/CPP-DEFINES | 1 - 1 file changed, 1 deletion(-) (limited to 'admin/CPP-DEFINES') diff --git a/admin/CPP-DEFINES b/admin/CPP-DEFINES index 27d87dcaa2a..8bfe2cac570 100644 --- a/admin/CPP-DEFINES +++ b/admin/CPP-DEFINES @@ -86,7 +86,6 @@ BROKEN_FIONREAD BROKEN_GET_CURRENT_DIR_NAME BROKEN_NON_BLOCKING_CONNECT BROKEN_PTY_READ_AFTER_EAGAIN -CLASH_DETECTION DATA_SEG_BITS DEFAULT_SOUND_DEVICE DEVICE_SEP -- cgit v1.2.3