Mercurial > hg > xemacs-beta
diff 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 |
line wrap: on
line diff
--- a/src/emacs.c Mon Aug 13 11:07:40 2007 +0200 +++ b/src/emacs.c Mon Aug 13 11:08:24 2007 +0200 @@ -920,6 +920,7 @@ syms_of_general (); syms_of_glyphs (); syms_of_glyphs_eimage (); + syms_of_glyphs_widget (); #if defined (HAVE_MENUBARS) || defined (HAVE_SCROLLBARS) || defined (HAVE_DIALOGS) || defined (HAVE_TOOLBARS) syms_of_gui (); #endif @@ -1170,6 +1171,7 @@ image_instantiator_format_create (); image_instantiator_format_create_glyphs_eimage (); + image_instantiator_format_create_glyphs_widget (); #ifdef HAVE_X_WINDOWS image_instantiator_format_create_glyphs_x (); #endif /* HAVE_X_WINDOWS */ @@ -1300,6 +1302,7 @@ vars_of_frame (); vars_of_glyphs (); vars_of_glyphs_eimage (); + vars_of_glyphs_widget (); #if defined (HAVE_MENUBARS) || defined (HAVE_SCROLLBARS) || defined (HAVE_DIALOGS) || defined (HAVE_TOOLBARS) vars_of_gui (); #endif @@ -2152,7 +2155,7 @@ /* GCC >= 2.8. -slb */ #if defined(GNU_MALLOC) static void -voodoo_free_hook(void *mem) +voodoo_free_hook (void *mem) { /* Disable all calls to free() when XEmacs is exiting and it doesn't */ /* matter. */ @@ -2410,8 +2413,6 @@ /* When we're dumping, we can't use the debugging free() */ disable_free_hook (); #endif -#if 1 /* martin */ -#endif CHECK_STRING (intoname); intoname = Fexpand_file_name (intoname, Qnil);