aboutsummaryrefslogtreecommitdiffstats
path: root/src/filelock.c
diff options
context:
space:
mode:
authorGlenn Morris2014-03-25 21:14:44 -0400
committerGlenn Morris2014-03-25 21:14:44 -0400
commit11ee65afc20d41f1fc31fe2ead84b2203b4bfeb0 (patch)
treea3ae87b8d8d73968f293973444fbf3ae753d83f1 /src/filelock.c
parentdefd53bdc5ef9d75fa112487d76f4d7a4cb9fe92 (diff)
downloademacs-11ee65afc20d41f1fc31fe2ead84b2203b4bfeb0.tar.gz
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/filelock.c')
-rw-r--r--src/filelock.c6
1 files changed, 0 insertions, 6 deletions
diff --git a/src/filelock.c b/src/filelock.c
index 5252db09104..cc5c821cadd 100644
--- a/src/filelock.c
+++ b/src/filelock.c
@@ -55,8 +55,6 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */
55#include "w32.h" /* for dostounix_filename */ 55#include "w32.h" /* for dostounix_filename */
56#endif 56#endif
57 57
58#ifdef CLASH_DETECTION
59
60#ifdef HAVE_UTMP_H 58#ifdef HAVE_UTMP_H
61#include <utmp.h> 59#include <utmp.h>
62#endif 60#endif
@@ -837,8 +835,6 @@ t if it is locked by you, else a string saying which user has locked it. */)
837 return ret; 835 return ret;
838} 836}
839 837
840#endif /* CLASH_DETECTION */
841
842void 838void
843syms_of_filelock (void) 839syms_of_filelock (void)
844{ 840{
@@ -850,9 +846,7 @@ syms_of_filelock (void)
850 doc: /* Non-nil means use lockfiles to avoid editing collisions. */); 846 doc: /* Non-nil means use lockfiles to avoid editing collisions. */);
851 create_lockfiles = 1; 847 create_lockfiles = 1;
852 848
853#ifdef CLASH_DETECTION
854 defsubr (&Sunlock_buffer); 849 defsubr (&Sunlock_buffer);
855 defsubr (&Slock_buffer); 850 defsubr (&Slock_buffer);
856 defsubr (&Sfile_locked_p); 851 defsubr (&Sfile_locked_p);
857#endif
858} 852}