[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] trunk r116874: Remove the build-time option CLASH_DETECTIO
From: |
Glenn Morris |
Subject: |
[Emacs-diffs] trunk r116874: Remove the build-time option CLASH_DETECTION |
Date: |
Wed, 26 Mar 2014 01:14:47 +0000 |
User-agent: |
Bazaar (2.6b2) |
------------------------------------------------------------
revno: 116874
revision-id: address@hidden
parent: address@hidden
committer: Glenn Morris <address@hidden>
branch nick: trunk
timestamp: Tue 2014-03-25 21:14:44 -0400
message:
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.
modified:
ChangeLog changelog-20091113204419-o5vbwnq5f7feedwu-1538
admin/CPP-DEFINES cppdefines-20091113204419-o5vbwnq5f7feedwu-8192
configure.ac
configure.in-20091113204419-o5vbwnq5f7feedwu-783
lisp/ChangeLog changelog-20091113204419-o5vbwnq5f7feedwu-1432
lisp/files.el files.el-20091113204419-o5vbwnq5f7feedwu-265
src/ChangeLog changelog-20091113204419-o5vbwnq5f7feedwu-1438
src/buffer.c buffer.c-20091113204419-o5vbwnq5f7feedwu-264
src/emacs.c emacs.c-20091113204419-o5vbwnq5f7feedwu-241
src/fileio.c fileio.c-20091113204419-o5vbwnq5f7feedwu-210
src/filelock.c filelock.c-20091113204419-o5vbwnq5f7feedwu-179
src/insdel.c insdel.c-20091113204419-o5vbwnq5f7feedwu-175
=== modified file 'ChangeLog'
--- a/ChangeLog 2014-03-23 09:17:29 +0000
+++ b/ChangeLog 2014-03-26 01:14:44 +0000
@@ -1,7 +1,11 @@
+2014-03-26 Glenn Morris <address@hidden>
+
+ * configure.ac (CLASH_DETECTION): Remove option. Every platform
+ supports it, and the runtime option `create-lockfiles' replaces it.
+
2014-03-23 Daniel Colascione <address@hidden>
- * configure.ac: (Bug#17069) Include GFILENOTIFY objects in glib
- check.
+ * configure.ac: (Bug#17069) Include GFILENOTIFY objects in glib check.
2014-03-22 Glenn Morris <address@hidden>
=== modified file 'admin/CPP-DEFINES'
--- a/admin/CPP-DEFINES 2013-07-02 16:56:29 +0000
+++ b/admin/CPP-DEFINES 2014-03-26 01:14:44 +0000
@@ -86,7 +86,6 @@
BROKEN_GET_CURRENT_DIR_NAME
BROKEN_NON_BLOCKING_CONNECT
BROKEN_PTY_READ_AFTER_EAGAIN
-CLASH_DETECTION
DATA_SEG_BITS
DEFAULT_SOUND_DEVICE
DEVICE_SEP
=== modified file 'configure.ac'
--- a/configure.ac 2014-03-23 09:17:29 +0000
+++ b/configure.ac 2014-03-26 01:14:44 +0000
@@ -3897,14 +3897,6 @@
in the full name stands for the login id.])
fi
-dnl Every platform that uses configure supports this.
-dnl There is a create-lockfiles option you can
-dnl customize if you do not want the lock files to be written.
-dnl So it is not clear that this #define still needs to exist.
-AC_DEFINE(CLASH_DETECTION, 1, [Define if you want lock files to be written,
- so that Emacs can tell instantly when you try to modify a file that
- someone else has modified in his/her Emacs.])
-
dnl Everybody supports this, except MS.
dnl Seems like the kind of thing we should be testing for, though.
## Note: PTYs are broken on darwin <6. Use at your own risk.
=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog 2014-03-24 03:06:35 +0000
+++ b/lisp/ChangeLog 2014-03-26 01:14:44 +0000
@@ -1,3 +1,8 @@
+2014-03-26 Glenn Morris <address@hidden>
+
+ * files.el (lock-buffer, unlock-buffer, file-locked-p):
+ Remove fallback aliases, since they are always defined now.
+
2014-03-24 Daniel Colascione <address@hidden>
* emacs-lisp/cl-macs.el (cl--do-arglist): Use `plist-member'
=== modified file 'lisp/files.el'
--- a/lisp/files.el 2014-03-22 22:36:29 +0000
+++ b/lisp/files.el 2014-03-26 01:14:44 +0000
@@ -559,14 +559,6 @@
(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
=== modified file 'src/ChangeLog'
--- a/src/ChangeLog 2014-03-25 16:00:37 +0000
+++ b/src/ChangeLog 2014-03-26 01:14:44 +0000
@@ -1,3 +1,12 @@
+2014-03-26 Glenn Morris <address@hidden>
+
+ * buffer.c (Frestore_buffer_modified_p, Fkill_buffer):
+ * emacs.c (shut_down_emacs):
+ * fileio.c (Finsert_file_contents, write_region):
+ * filelock.c (top-level, syms_of_filelock):
+ * insdel.c (prepare_to_modify_buffer_1):
+ CLASH_DETECTION is always defined now.
+
2014-03-25 Eli Zaretskii <address@hidden>
* w32.c (w32_delayed_load): Call DisableThreadLibraryCalls on the
=== modified file 'src/buffer.c'
--- a/src/buffer.c 2014-03-15 11:16:12 +0000
+++ b/src/buffer.c 2014-03-26 01:14:44 +0000
@@ -1,7 +1,6 @@
/* Buffer manipulation primitives for GNU Emacs.
-Copyright (C) 1985-1989, 1993-1995, 1997-2014 Free Software Foundation,
-Inc.
+Copyright (C) 1985-1989, 1993-1995, 1997-2014 Free Software Foundation, Inc.
This file is part of GNU Emacs.
@@ -1380,7 +1379,6 @@
state of the current buffer. Use with care. */)
(Lisp_Object flag)
{
-#ifdef CLASH_DETECTION
Lisp_Object fn;
/* If buffer becoming modified, lock the file.
@@ -1400,7 +1398,6 @@
else if (already && NILP (flag))
unlock_file (fn);
}
-#endif /* CLASH_DETECTION */
/* Here we have a problem. SAVE_MODIFF is used here to encode
buffer-modified-p (as SAVE_MODIFF<MODIFF) as well as
@@ -1820,10 +1817,8 @@
/* Now there is no question: we can kill the buffer. */
-#ifdef CLASH_DETECTION
/* Unlock this buffer's file, if it is locked. */
unlock_buffer (b);
-#endif /* CLASH_DETECTION */
GCPRO1 (buffer);
kill_buffer_processes (buffer);
=== modified file 'src/emacs.c'
--- a/src/emacs.c 2014-03-21 10:38:41 +0000
+++ b/src/emacs.c 2014-03-26 01:14:44 +0000
@@ -1,7 +1,7 @@
/* Fully extensible Emacs, running on Unix, intended for GNU.
-Copyright (C) 1985-1987, 1993-1995, 1997-1999, 2001-2014 Free Software
-Foundation, Inc.
+Copyright (C) 1985-1987, 1993-1995, 1997-1999, 2001-2014
+ Free Software Foundation, Inc.
This file is part of GNU Emacs.
@@ -2032,9 +2032,7 @@
kill_buffer_processes (Qnil);
Fdo_auto_save (Qt, Qnil);
-#ifdef CLASH_DETECTION
unlock_all_files ();
-#endif
/* There is a tendency for a SIGIO signal to arrive within exit,
and cause a SIGHUP because the input descriptor is already closed. */
=== modified file 'src/fileio.c'
--- a/src/fileio.c 2014-03-01 11:51:02 +0000
+++ b/src/fileio.c 2014-03-26 01:14:44 +0000
@@ -4079,13 +4079,11 @@
if (NILP (visit) && total > 0)
{
-#ifdef CLASH_DETECTION
if (!NILP (BVAR (current_buffer, file_truename))
/* Make binding buffer-file-name to nil effective. */
&& !NILP (BVAR (current_buffer, filename))
&& SAVE_MODIFF >= MODIFF)
we_locked_file = 1;
-#endif /* CLASH_DETECTION */
prepare_to_modify_buffer (GPT, GPT, NULL);
}
@@ -4185,10 +4183,8 @@
if (inserted == 0)
{
-#ifdef CLASH_DETECTION
if (we_locked_file)
unlock_file (BVAR (current_buffer, file_truename));
-#endif
Vdeactivate_mark = old_Vdeactivate_mark;
}
else
@@ -4337,14 +4333,12 @@
SAVE_MODIFF = MODIFF;
BUF_AUTOSAVE_MODIFF (current_buffer) = MODIFF;
XSETFASTINT (BVAR (current_buffer, save_length), Z - BEG);
-#ifdef CLASH_DETECTION
if (NILP (handler))
{
if (!NILP (BVAR (current_buffer, file_truename)))
unlock_file (BVAR (current_buffer, file_truename));
unlock_file (filename);
}
-#endif /* CLASH_DETECTION */
if (not_regular)
xsignal2 (Qfile_error,
build_string ("not a regular file"), orig_filename);
@@ -4814,13 +4808,11 @@
if (!STRINGP (start) && !NILP (BVAR (current_buffer, selective_display)))
coding.mode |= CODING_MODE_SELECTIVE_DISPLAY;
-#ifdef CLASH_DETECTION
if (open_and_close_file && !auto_saving)
{
lock_file (lockname);
file_locked = 1;
}
-#endif /* CLASH_DETECTION */
encoded_filename = ENCODE_FILE (filename);
fn = SSDATA (encoded_filename);
@@ -4842,10 +4834,8 @@
if (desc < 0)
{
int open_errno = errno;
-#ifdef CLASH_DETECTION
if (file_locked)
unlock_file (lockname);
-#endif /* CLASH_DETECTION */
UNGCPRO;
report_file_errno ("Opening output file", filename, open_errno);
}
@@ -4860,10 +4850,8 @@
if (ret < 0)
{
int lseek_errno = errno;
-#ifdef CLASH_DETECTION
if (file_locked)
unlock_file (lockname);
-#endif /* CLASH_DETECTION */
UNGCPRO;
report_file_errno ("Lseek error", filename, lseek_errno);
}
@@ -5006,10 +4994,8 @@
unbind_to (count, Qnil);
-#ifdef CLASH_DETECTION
if (file_locked)
unlock_file (lockname);
-#endif /* CLASH_DETECTION */
/* Do this before reporting IO error
to avoid a "file has changed on disk" warning on
=== modified file 'src/filelock.c'
--- a/src/filelock.c 2014-02-25 18:32:52 +0000
+++ b/src/filelock.c 2014-03-26 01:14:44 +0000
@@ -55,8 +55,6 @@
#include "w32.h" /* for dostounix_filename */
#endif
-#ifdef CLASH_DETECTION
-
#ifdef HAVE_UTMP_H
#include <utmp.h>
#endif
@@ -837,8 +835,6 @@
return ret;
}
-#endif /* CLASH_DETECTION */
-
void
syms_of_filelock (void)
{
@@ -850,9 +846,7 @@
doc: /* Non-nil means use lockfiles to avoid editing collisions.
*/);
create_lockfiles = 1;
-#ifdef CLASH_DETECTION
defsubr (&Sunlock_buffer);
defsubr (&Slock_buffer);
defsubr (&Sfile_locked_p);
-#endif
}
=== modified file 'src/insdel.c'
--- a/src/insdel.c 2014-01-01 17:44:48 +0000
+++ b/src/insdel.c 2014-03-26 01:14:44 +0000
@@ -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 @@
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). */
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] trunk r116874: Remove the build-time option CLASH_DETECTION,
Glenn Morris <=