Mercurial > hg > xemacs-beta
comparison src/emacs.c @ 5093:33bc58a32dc2
merge
author | Ben Wing <ben@xemacs.org> |
---|---|
date | Wed, 03 Mar 2010 05:19:49 -0600 |
parents | 0ca81354c4c7 ed624ab64583 |
children | 7be849cb8828 |
comparison
equal
deleted
inserted
replaced
5090:0ca81354c4c7 | 5093:33bc58a32dc2 |
---|---|
1536 syms_of_font_lock (); | 1536 syms_of_font_lock (); |
1537 #endif /* USE_C_FONT_LOCK */ | 1537 #endif /* USE_C_FONT_LOCK */ |
1538 syms_of_frame (); | 1538 syms_of_frame (); |
1539 syms_of_general (); | 1539 syms_of_general (); |
1540 syms_of_glyphs (); | 1540 syms_of_glyphs (); |
1541 #ifdef HAVE_WINDOW_SYSTEM | |
1541 syms_of_glyphs_eimage (); | 1542 syms_of_glyphs_eimage (); |
1542 syms_of_glyphs_shared (); | 1543 syms_of_glyphs_shared (); |
1544 #endif | |
1543 syms_of_glyphs_widget (); | 1545 syms_of_glyphs_widget (); |
1544 syms_of_gui (); | 1546 syms_of_gui (); |
1545 syms_of_gutter (); | 1547 syms_of_gutter (); |
1546 syms_of_indent (); | 1548 syms_of_indent (); |
1547 syms_of_intl (); | 1549 syms_of_intl (); |
1871 | 1873 |
1872 For any given image instantiator format, the first macro must be | 1874 For any given image instantiator format, the first macro must be |
1873 called before the any calls to the other macros. */ | 1875 called before the any calls to the other macros. */ |
1874 | 1876 |
1875 image_instantiator_format_create (); | 1877 image_instantiator_format_create (); |
1878 #ifdef HAVE_WINDOW_SYSTEM | |
1876 image_instantiator_format_create_glyphs_eimage (); | 1879 image_instantiator_format_create_glyphs_eimage (); |
1880 #endif | |
1877 image_instantiator_format_create_glyphs_widget (); | 1881 image_instantiator_format_create_glyphs_widget (); |
1878 #ifdef HAVE_TTY | 1882 #ifdef HAVE_TTY |
1879 image_instantiator_format_create_glyphs_tty (); | 1883 image_instantiator_format_create_glyphs_tty (); |
1880 #endif | 1884 #endif |
1881 #ifdef HAVE_X_WINDOWS | 1885 #ifdef HAVE_X_WINDOWS |
2102 vars_of_font_lock (); | 2106 vars_of_font_lock (); |
2103 #endif /* USE_C_FONT_LOCK */ | 2107 #endif /* USE_C_FONT_LOCK */ |
2104 vars_of_frame (); | 2108 vars_of_frame (); |
2105 vars_of_gc (); | 2109 vars_of_gc (); |
2106 vars_of_glyphs (); | 2110 vars_of_glyphs (); |
2111 #ifdef HAVE_WINDOW_SYSTEM | |
2107 vars_of_glyphs_eimage (); | 2112 vars_of_glyphs_eimage (); |
2113 #endif | |
2108 vars_of_glyphs_widget (); | 2114 vars_of_glyphs_widget (); |
2109 vars_of_gui (); | 2115 vars_of_gui (); |
2110 vars_of_gutter (); | 2116 vars_of_gutter (); |
2111 vars_of_indent (); | 2117 vars_of_indent (); |
2112 vars_of_insdel (); | 2118 vars_of_insdel (); |