3 files changed, 11 insertions, 4 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index c56e38dbe60..2d46e42e17b 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,10 @@
+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)
diff --git a/src/emacs.c b/src/emacs.c
index e83725ccf03..a38847e3bd3 100644
--- a/src/emacs.c
+++ b/src/emacs.c
@@ -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 (); */
diff --git a/src/filelock.c b/src/filelock.c
index acca7234419..ae0584c447a 100644
--- a/src/filelock.c
+++ b/src/filelock.c
@@ -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) */