Mercurial > emacs
changeset 111228:6f50064cb399
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.
| author | Eli Zaretskii <eliz@gnu.org> |
|---|---|
| date | Fri, 29 Oct 2010 12:43:38 +0200 |
| parents | 17c2d0830a46 |
| children | 9450439a37a3 |
| files | src/ChangeLog src/emacs.c src/filelock.c |
| diffstat | 3 files changed, 11 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/src/ChangeLog Fri Oct 29 07:22:52 2010 +0000 +++ b/src/ChangeLog Fri Oct 29 12:43:38 2010 +0200 @@ -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)
--- a/src/emacs.c Fri Oct 29 07:22:52 2010 +0000 +++ b/src/emacs.c Fri Oct 29 12:43:38 2010 +0200 @@ -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 (); */
--- a/src/filelock.c Fri Oct 29 07:22:52 2010 +0000 +++ b/src/filelock.c Fri Oct 29 12:43:38 2010 +0200 @@ -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) */