diff options
| author | Glenn Morris | 2014-03-25 21:14:44 -0400 |
|---|---|---|
| committer | Glenn Morris | 2014-03-25 21:14:44 -0400 |
| commit | 11ee65afc20d41f1fc31fe2ead84b2203b4bfeb0 (patch) | |
| tree | a3ae87b8d8d73968f293973444fbf3ae753d83f1 /src/buffer.c | |
| parent | defd53bdc5ef9d75fa112487d76f4d7a4cb9fe92 (diff) | |
| download | emacs-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/buffer.c')
| -rw-r--r-- | src/buffer.c | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/src/buffer.c b/src/buffer.c index daafbcef0e4..5e923d26f3f 100644 --- a/src/buffer.c +++ b/src/buffer.c | |||
| @@ -1,7 +1,6 @@ | |||
| 1 | /* Buffer manipulation primitives for GNU Emacs. | 1 | /* Buffer manipulation primitives for GNU Emacs. |
| 2 | 2 | ||
| 3 | Copyright (C) 1985-1989, 1993-1995, 1997-2014 Free Software Foundation, | 3 | Copyright (C) 1985-1989, 1993-1995, 1997-2014 Free Software Foundation, Inc. |
| 4 | Inc. | ||
| 5 | 4 | ||
| 6 | This file is part of GNU Emacs. | 5 | This file is part of GNU Emacs. |
| 7 | 6 | ||
| @@ -1380,7 +1379,6 @@ It is not ensured that mode lines will be updated to show the modified | |||
| 1380 | state of the current buffer. Use with care. */) | 1379 | state of the current buffer. Use with care. */) |
| 1381 | (Lisp_Object flag) | 1380 | (Lisp_Object flag) |
| 1382 | { | 1381 | { |
| 1383 | #ifdef CLASH_DETECTION | ||
| 1384 | Lisp_Object fn; | 1382 | Lisp_Object fn; |
| 1385 | 1383 | ||
| 1386 | /* If buffer becoming modified, lock the file. | 1384 | /* If buffer becoming modified, lock the file. |
| @@ -1400,7 +1398,6 @@ state of the current buffer. Use with care. */) | |||
| 1400 | else if (already && NILP (flag)) | 1398 | else if (already && NILP (flag)) |
| 1401 | unlock_file (fn); | 1399 | unlock_file (fn); |
| 1402 | } | 1400 | } |
| 1403 | #endif /* CLASH_DETECTION */ | ||
| 1404 | 1401 | ||
| 1405 | /* Here we have a problem. SAVE_MODIFF is used here to encode | 1402 | /* Here we have a problem. SAVE_MODIFF is used here to encode |
| 1406 | buffer-modified-p (as SAVE_MODIFF<MODIFF) as well as | 1403 | buffer-modified-p (as SAVE_MODIFF<MODIFF) as well as |
| @@ -1820,10 +1817,8 @@ cleaning up all windows currently displaying the buffer to be killed. */) | |||
| 1820 | 1817 | ||
| 1821 | /* Now there is no question: we can kill the buffer. */ | 1818 | /* Now there is no question: we can kill the buffer. */ |
| 1822 | 1819 | ||
| 1823 | #ifdef CLASH_DETECTION | ||
| 1824 | /* Unlock this buffer's file, if it is locked. */ | 1820 | /* Unlock this buffer's file, if it is locked. */ |
| 1825 | unlock_buffer (b); | 1821 | unlock_buffer (b); |
| 1826 | #endif /* CLASH_DETECTION */ | ||
| 1827 | 1822 | ||
| 1828 | GCPRO1 (buffer); | 1823 | GCPRO1 (buffer); |
| 1829 | kill_buffer_processes (buffer); | 1824 | kill_buffer_processes (buffer); |