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 /lisp | |
| 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 'lisp')
| -rw-r--r-- | lisp/ChangeLog | 5 | ||||
| -rw-r--r-- | lisp/files.el | 8 |
2 files changed, 5 insertions, 8 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index aee5738dc43..0bc53b69da0 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,8 @@ +2014-03-26 Glenn Morris <rgm@gnu.org> + + * files.el (lock-buffer, unlock-buffer, file-locked-p): + Remove fallback aliases, since they are always defined now. + 2014-03-24 Daniel Colascione <dancol@dancol.org> * emacs-lisp/cl-macs.el (cl--do-arglist): Use `plist-member' diff --git a/lisp/files.el b/lisp/files.el index a17677b564d..5883c8c348e 100644 --- a/lisp/files.el +++ b/lisp/files.el @@ -559,14 +559,6 @@ A value of nil means ignore them; anything else means query." (other :tag "Query" other)) :group 'find-file) -;; Avoid losing in versions where CLASH_DETECTION is disabled. -(or (fboundp 'lock-buffer) - (defalias 'lock-buffer 'ignore)) -(or (fboundp 'unlock-buffer) - (defalias 'unlock-buffer 'ignore)) -(or (fboundp 'file-locked-p) - (defalias 'file-locked-p 'ignore)) - (defcustom view-read-only nil "Non-nil means buffers visiting files read-only do so in view mode. In fact, this means that all read-only buffers normally have |