Mercurial > hg > xemacs-beta
comparison src/emacs.c @ 373:6240c7796c7a r21-2b2
Import from CVS: tag r21-2b2
author | cvs |
---|---|
date | Mon, 13 Aug 2007 11:04:06 +0200 |
parents | cc15677e0335 |
children | d883f39b8495 |
comparison
equal
deleted
inserted
replaced
372:49e1ed2d7ed8 | 373:6240c7796c7a |
---|---|
610 #endif /* APOLLO */ | 610 #endif /* APOLLO */ |
611 | 611 |
612 #if defined (HAVE_MMAP) && defined (REL_ALLOC) | 612 #if defined (HAVE_MMAP) && defined (REL_ALLOC) |
613 /* ralloc can only be used if using the GNU memory allocator. */ | 613 /* ralloc can only be used if using the GNU memory allocator. */ |
614 init_ralloc (); | 614 init_ralloc (); |
615 #elif defined (REL_ALLOC) && !defined(DOUG_LEA_MALLOC) | |
616 if (initialized) | |
617 init_ralloc(); | |
615 #endif | 618 #endif |
616 | 619 |
617 #ifdef HAVE_SOCKS | 620 #ifdef HAVE_SOCKS |
618 if (initialized) | 621 if (initialized) |
619 SOCKSinit (argv[0]); | 622 SOCKSinit (argv[0]); |
1276 vars_of_event_stream (); | 1279 vars_of_event_stream (); |
1277 vars_of_events (); | 1280 vars_of_events (); |
1278 vars_of_extents (); | 1281 vars_of_extents (); |
1279 vars_of_faces (); | 1282 vars_of_faces (); |
1280 vars_of_fileio (); | 1283 vars_of_fileio (); |
1281 #ifdef CLASH_DETECTION | |
1282 vars_of_filelock (); | |
1283 #endif | |
1284 vars_of_floatfns (); | 1284 vars_of_floatfns (); |
1285 vars_of_font_lock (); | 1285 vars_of_font_lock (); |
1286 vars_of_frame (); | 1286 vars_of_frame (); |
1287 vars_of_glyphs (); | 1287 vars_of_glyphs (); |
1288 vars_of_glyphs_eimage (); | 1288 vars_of_glyphs_eimage (); |
1532 complex_vars_of_minibuf (); | 1532 complex_vars_of_minibuf (); |
1533 | 1533 |
1534 /* These two might call Ffile_name_as_directory(), which | 1534 /* These two might call Ffile_name_as_directory(), which |
1535 might depend on all sorts of things; I'm not sure. */ | 1535 might depend on all sorts of things; I'm not sure. */ |
1536 complex_vars_of_emacs (); | 1536 complex_vars_of_emacs (); |
1537 | |
1538 #ifdef CLASH_DETECTION | |
1539 complex_vars_of_filelock (); | |
1540 #endif /* CLASH_DETECTION */ | |
1541 | 1537 |
1542 /* This creates a couple of basic keymaps and depends on Lisp | 1538 /* This creates a couple of basic keymaps and depends on Lisp |
1543 hashtables and Ffset() (both of which depend on some variables | 1539 hashtables and Ffset() (both of which depend on some variables |
1544 initialized in the vars_of_*() section) and possibly other | 1540 initialized in the vars_of_*() section) and possibly other |
1545 stuff. */ | 1541 stuff. */ |