[Emacs-diffs] /srv/bzr/emacs/trunk r102149: Fix revno 102144 for non-CLASH_DETECTION platforms.

[Eli Zaretskii]

------------------------------------------------------------
revno: 102149
committer: Eli Zaretskii <address@hidden>
branch nick: trunk
timestamp: Fri 2010-10-29 12:43:38 +0200
message:
  Fix revno 102144 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.
modified:
  src/ChangeLog
  src/emacs.c
  src/filelock.c

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2010-10-29 07:04:09 +0000
+++ b/src/ChangeLog     2010-10-29 10:43:38 +0000
@@ -1,3 +1,10 @@
+2010-10-29  Eli Zaretskii  <address@hidden>
+
+       * 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  <address@hidden>
 
        * nsfns.m (Fx-display-save-under, Fx-open-connection)

=== modified file 'src/emacs.c'
--- a/src/emacs.c       2010-10-24 16:00:57 +0000
+++ b/src/emacs.c       2010-10-29 10:43:38 +0000
@@ -1509,9 +1509,7 @@
       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 (); */

=== modified file 'src/filelock.c'
--- a/src/filelock.c    2010-10-03 15:19:34 +0000
+++ b/src/filelock.c    2010-10-29 10:43:38 +0000
@@ -730,6 +730,8 @@
   boot_time_initialized = 0;
 }
 
+#endif /* CLASH_DETECTION */
+
 void
 syms_of_filelock (void)
 {
@@ -737,12 +739,12 @@
               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) */