diff options
| author | Eli Zaretskii | 2010-10-29 12:43:38 +0200 |
|---|---|---|
| committer | Eli Zaretskii | 2010-10-29 12:43:38 +0200 |
| commit | ffe75e6b11498ef4e105aed8f650db343194c9e2 (patch) | |
| tree | a2b6ca8b038076fc12f6bb5f0339a39e529dd9a5 /src/emacs.c | |
| parent | 95de0327d08519791252386914c514db860d7588 (diff) | |
| download | emacs-ffe75e6b11498ef4e105aed8f650db343194c9e2.tar.gz emacs-ffe75e6b11498ef4e105aed8f650db343194c9e2.zip | |
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.
Diffstat (limited to 'src/emacs.c')
| -rw-r--r-- | src/emacs.c | 2 |
1 files changed, 0 insertions, 2 deletions
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) | |||
| 1509 | syms_of_doc (); | 1509 | syms_of_doc (); |
| 1510 | syms_of_editfns (); | 1510 | syms_of_editfns (); |
| 1511 | syms_of_emacs (); | 1511 | syms_of_emacs (); |
| 1512 | #ifdef CLASH_DETECTION | ||
| 1513 | syms_of_filelock (); | 1512 | syms_of_filelock (); |
| 1514 | #endif /* CLASH_DETECTION */ | ||
| 1515 | syms_of_indent (); | 1513 | syms_of_indent (); |
| 1516 | syms_of_insdel (); | 1514 | syms_of_insdel (); |
| 1517 | /* syms_of_keymap (); */ | 1515 | /* syms_of_keymap (); */ |