Commit ffe75e6b authored by Eli Zaretskii's avatar Eli Zaretskii

Fix 2010-10-29T06:51:36Z!rgm@gnu.org for non-CLASH_DETECTION platforms.

 emacs.c (main): Call syms_of_filelock unconditionally.
 filelock.c (syms_of_filelock): Move out of #ifdef CLASH_DETECTION
 clause, but keep part of it conditioned on CLASH_DETECTION.
parent 95de0327
2010-10-29 Eli Zaretskii <eliz@gnu.org>
* emacs.c (main): Call syms_of_filelock unconditionally.
* filelock.c (syms_of_filelock): Move out of #ifdef CLASH_DETECTION
clause, but keep part of it conditioned on CLASH_DETECTION.
2010-10-29 Glenn Morris <rgm@gnu.org>
* nsfns.m (Fx-display-save-under, Fx-open-connection)
......
......@@ -1509,9 +1509,7 @@ main (int argc, char **argv)
syms_of_doc ();
syms_of_editfns ();
syms_of_emacs ();
#ifdef CLASH_DETECTION
syms_of_filelock ();
#endif /* CLASH_DETECTION */
syms_of_indent ();
syms_of_insdel ();
/* syms_of_keymap (); */
......
......@@ -730,6 +730,8 @@ init_filelock (void)
boot_time_initialized = 0;
}
#endif /* CLASH_DETECTION */
void
syms_of_filelock (void)
{
......@@ -737,12 +739,12 @@ syms_of_filelock (void)
doc: /* The directory for writing temporary files. */);
Vtemporary_file_directory = Qnil;
#ifdef CLASH_DETECTION
defsubr (&Sunlock_buffer);
defsubr (&Slock_buffer);
defsubr (&Sfile_locked_p);
#endif
}
#endif /* CLASH_DETECTION */
/* arch-tag: e062676d-50b2-4be0-ab96-197c81b181a1
(do not change this comment) */
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment