mirrors/emacs
1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2026-02-05 07:01:11 -08:00
Code Issues Projects Releases Wiki Activity

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

Browse source 
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.
This commit is contained in:
Eli Zaretskii 2010-10-29 12:43:38 +02:00
parent 95de0327d0
commit ffe75e6b11
3 changed files with 11 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

7
src/ChangeLog
View file

@ -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)

2
src/emacs.c
View file

@ -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 (); */

6
src/filelock.c
View file

@ -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) */