comparison src/emacs.c @ 384:bbff43aa5eb7 r21-2-7

Import from CVS: tag r21-2-7
author cvs
date Mon, 13 Aug 2007 11:08:24 +0200
parents 8626e4521993
children aabb7f5b1c81
comparison
equal deleted inserted replaced
383:6a50c6a581a5 384:bbff43aa5eb7
918 syms_of_font_lock (); 918 syms_of_font_lock ();
919 syms_of_frame (); 919 syms_of_frame ();
920 syms_of_general (); 920 syms_of_general ();
921 syms_of_glyphs (); 921 syms_of_glyphs ();
922 syms_of_glyphs_eimage (); 922 syms_of_glyphs_eimage ();
923 syms_of_glyphs_widget ();
923 #if defined (HAVE_MENUBARS) || defined (HAVE_SCROLLBARS) || defined (HAVE_DIALOGS) || defined (HAVE_TOOLBARS) 924 #if defined (HAVE_MENUBARS) || defined (HAVE_SCROLLBARS) || defined (HAVE_DIALOGS) || defined (HAVE_TOOLBARS)
924 syms_of_gui (); 925 syms_of_gui ();
925 #endif 926 #endif
926 syms_of_indent (); 927 syms_of_indent ();
927 syms_of_intl (); 928 syms_of_intl ();
1168 For any given image instantiator format, the first macro must be 1169 For any given image instantiator format, the first macro must be
1169 called before the any calls to the other macros. */ 1170 called before the any calls to the other macros. */
1170 1171
1171 image_instantiator_format_create (); 1172 image_instantiator_format_create ();
1172 image_instantiator_format_create_glyphs_eimage (); 1173 image_instantiator_format_create_glyphs_eimage ();
1174 image_instantiator_format_create_glyphs_widget ();
1173 #ifdef HAVE_X_WINDOWS 1175 #ifdef HAVE_X_WINDOWS
1174 image_instantiator_format_create_glyphs_x (); 1176 image_instantiator_format_create_glyphs_x ();
1175 #endif /* HAVE_X_WINDOWS */ 1177 #endif /* HAVE_X_WINDOWS */
1176 #ifdef HAVE_MS_WINDOWS 1178 #ifdef HAVE_MS_WINDOWS
1177 image_instantiator_format_create_glyphs_mswindows (); 1179 image_instantiator_format_create_glyphs_mswindows ();
1298 vars_of_floatfns (); 1300 vars_of_floatfns ();
1299 vars_of_font_lock (); 1301 vars_of_font_lock ();
1300 vars_of_frame (); 1302 vars_of_frame ();
1301 vars_of_glyphs (); 1303 vars_of_glyphs ();
1302 vars_of_glyphs_eimage (); 1304 vars_of_glyphs_eimage ();
1305 vars_of_glyphs_widget ();
1303 #if defined (HAVE_MENUBARS) || defined (HAVE_SCROLLBARS) || defined (HAVE_DIALOGS) || defined (HAVE_TOOLBARS) 1306 #if defined (HAVE_MENUBARS) || defined (HAVE_SCROLLBARS) || defined (HAVE_DIALOGS) || defined (HAVE_TOOLBARS)
1304 vars_of_gui (); 1307 vars_of_gui ();
1305 #endif 1308 #endif
1306 vars_of_indent (); 1309 vars_of_indent ();
1307 vars_of_insdel (); 1310 vars_of_insdel ();
2150 /* The following needs conditionalization on whether either XEmacs or */ 2153 /* The following needs conditionalization on whether either XEmacs or */
2151 /* various system shared libraries have been built and linked with */ 2154 /* various system shared libraries have been built and linked with */
2152 /* GCC >= 2.8. -slb */ 2155 /* GCC >= 2.8. -slb */
2153 #if defined(GNU_MALLOC) 2156 #if defined(GNU_MALLOC)
2154 static void 2157 static void
2155 voodoo_free_hook(void *mem) 2158 voodoo_free_hook (void *mem)
2156 { 2159 {
2157 /* Disable all calls to free() when XEmacs is exiting and it doesn't */ 2160 /* Disable all calls to free() when XEmacs is exiting and it doesn't */
2158 /* matter. */ 2161 /* matter. */
2159 __free_hook = voodoo_free_hook; 2162 __free_hook = voodoo_free_hook;
2160 } 2163 }
2408 Freally_free (Qnil); 2411 Freally_free (Qnil);
2409 2412
2410 /* When we're dumping, we can't use the debugging free() */ 2413 /* When we're dumping, we can't use the debugging free() */
2411 disable_free_hook (); 2414 disable_free_hook ();
2412 #endif 2415 #endif
2413 #if 1 /* martin */
2414 #endif
2415 2416
2416 CHECK_STRING (intoname); 2417 CHECK_STRING (intoname);
2417 intoname = Fexpand_file_name (intoname, Qnil); 2418 intoname = Fexpand_file_name (intoname, Qnil);
2418 if (!NILP (symname)) 2419 if (!NILP (symname))
2419 { 2420 {