Mercurial > hg > xemacs-beta
comparison src/emacs.c @ 3354:15fb91e3a115
[xemacs-hg @ 2006-04-23 16:11:16 by stephent]
Xft/fontconfig refactoring, Part I. <87hd4ks29d.fsf@tleepslib.sk.tsukuba.ac.jp>
author | stephent |
---|---|
date | Sun, 23 Apr 2006 16:11:34 +0000 |
parents | d674024a8674 |
children | 316fddbf58e2 |
comparison
equal
deleted
inserted
replaced
3353:521d94807505 | 3354:15fb91e3a115 |
---|---|
1618 syms_of_input_method_xlib (); | 1618 syms_of_input_method_xlib (); |
1619 #endif | 1619 #endif |
1620 #endif /* HAVE_XIM */ | 1620 #endif /* HAVE_XIM */ |
1621 | 1621 |
1622 #ifdef USE_XFT | 1622 #ifdef USE_XFT |
1623 syms_of_xft_fonts(); | 1623 syms_of_font_mgr(); |
1624 #endif | 1624 #endif |
1625 | 1625 |
1626 #endif /* HAVE_X_WINDOWS */ | 1626 #endif /* HAVE_X_WINDOWS */ |
1627 | 1627 |
1628 #ifdef HAVE_MS_WINDOWS | 1628 #ifdef HAVE_MS_WINDOWS |
2203 #if defined (HAVE_MENUBARS) || defined (HAVE_SCROLLBARS) || defined (HAVE_X_DIALOGS) || defined (HAVE_TOOLBARS) | 2203 #if defined (HAVE_MENUBARS) || defined (HAVE_SCROLLBARS) || defined (HAVE_X_DIALOGS) || defined (HAVE_TOOLBARS) |
2204 vars_of_gui_x (); | 2204 vars_of_gui_x (); |
2205 #endif | 2205 #endif |
2206 | 2206 |
2207 #ifdef USE_XFT | 2207 #ifdef USE_XFT |
2208 vars_of_xft_fonts (); | 2208 vars_of_font_mgr (); |
2209 #endif | 2209 #endif |
2210 | 2210 |
2211 #endif /* HAVE_X_WINDOWS */ | 2211 #endif /* HAVE_X_WINDOWS */ |
2212 | 2212 |
2213 | 2213 |
2333 reinit_vars_of_select_x (); | 2333 reinit_vars_of_select_x (); |
2334 #if defined (HAVE_MENUBARS) || defined (HAVE_SCROLLBARS) || defined (HAVE_X_DIALOGS) || defined (HAVE_TOOLBARS) | 2334 #if defined (HAVE_MENUBARS) || defined (HAVE_SCROLLBARS) || defined (HAVE_X_DIALOGS) || defined (HAVE_TOOLBARS) |
2335 reinit_vars_of_gui_x (); | 2335 reinit_vars_of_gui_x (); |
2336 #endif | 2336 #endif |
2337 #ifdef USE_XFT | 2337 #ifdef USE_XFT |
2338 reinit_vars_of_xft_fonts (); | 2338 reinit_vars_of_font_mgr (); |
2339 #endif | 2339 #endif |
2340 #endif /* HAVE_X_WINDOWS */ | 2340 #endif /* HAVE_X_WINDOWS */ |
2341 | 2341 |
2342 #ifdef MULE | 2342 #ifdef MULE |
2343 reinit_vars_of_mule_coding (); | 2343 reinit_vars_of_mule_coding (); |
2405 inhibit_non_essential_conversion_operations = 0; | 2405 inhibit_non_essential_conversion_operations = 0; |
2406 | 2406 |
2407 #ifdef USE_XFT | 2407 #ifdef USE_XFT |
2408 /* This uses coding systems. Must be done before faces are init'ed. */ | 2408 /* This uses coding systems. Must be done before faces are init'ed. */ |
2409 /* not in xft reloaded #3 */ | 2409 /* not in xft reloaded #3 */ |
2410 complex_vars_of_xft_fonts (); | 2410 complex_vars_of_font_mgr (); |
2411 #endif | 2411 #endif |
2412 | 2412 |
2413 /* Depends on specifiers. */ | 2413 /* Depends on specifiers. */ |
2414 complex_vars_of_faces (); | 2414 complex_vars_of_faces (); |
2415 | 2415 |