comparison src/emacs.c @ 4922:8934492a0e97

merge
author Ben Wing <ben@xemacs.org>
date Wed, 03 Feb 2010 08:03:15 -0600
parents 17362f371cc2 fce43cb76a1c
children cbe181529c34
comparison
equal deleted inserted replaced
4921:17362f371cc2 4922:8934492a0e97
389 redisplay.c (various scattered) 389 redisplay.c (various scattered)
390 regex.c (various scattered) 390 regex.c (various scattered)
391 sysdep.c (maybe; wait_for_termination) 391 sysdep.c (maybe; wait_for_termination)
392 unexec.c 392 unexec.c
393 unicode.c 393 unicode.c
394 xgccache.c (a bit) 394 gccache-x.c (a bit)
395 395
396 #### review .h files; write a perl program to look for long comments 396 #### review .h files; write a perl program to look for long comments
397 throughout the files, ignoring stuff inside of DEFUN's. 397 throughout the files, ignoring stuff inside of DEFUN's.
398 398
399 #### elsewhere? 399 #### elsewhere?
1639 #ifdef XIM_XLIB 1639 #ifdef XIM_XLIB
1640 syms_of_input_method_xlib (); 1640 syms_of_input_method_xlib ();
1641 #endif 1641 #endif
1642 #endif /* HAVE_XIM */ 1642 #endif /* HAVE_XIM */
1643 1643
1644 #ifdef USE_XFT 1644 #ifdef HAVE_XFT
1645 syms_of_font_mgr(); 1645 syms_of_font_mgr();
1646 #endif 1646 #endif
1647 1647
1648 #endif /* HAVE_X_WINDOWS */ 1648 #endif /* HAVE_X_WINDOWS */
1649 1649
2222 #endif 2222 #endif
2223 #if defined (HAVE_MENUBARS) || defined (HAVE_SCROLLBARS) || defined (HAVE_X_DIALOGS) || defined (HAVE_TOOLBARS) 2223 #if defined (HAVE_MENUBARS) || defined (HAVE_SCROLLBARS) || defined (HAVE_X_DIALOGS) || defined (HAVE_TOOLBARS)
2224 vars_of_gui_x (); 2224 vars_of_gui_x ();
2225 #endif 2225 #endif
2226 2226
2227 #ifdef USE_XFT 2227 #ifdef HAVE_XFT
2228 vars_of_font_mgr (); 2228 vars_of_font_mgr ();
2229 #endif 2229 #endif
2230 2230
2231 #endif /* HAVE_X_WINDOWS */ 2231 #endif /* HAVE_X_WINDOWS */
2232 2232
2353 #endif 2353 #endif
2354 reinit_vars_of_select_x (); 2354 reinit_vars_of_select_x ();
2355 #if defined (HAVE_MENUBARS) || defined (HAVE_SCROLLBARS) || defined (HAVE_X_DIALOGS) || defined (HAVE_TOOLBARS) 2355 #if defined (HAVE_MENUBARS) || defined (HAVE_SCROLLBARS) || defined (HAVE_X_DIALOGS) || defined (HAVE_TOOLBARS)
2356 reinit_vars_of_gui_x (); 2356 reinit_vars_of_gui_x ();
2357 #endif 2357 #endif
2358 #ifdef USE_XFT 2358 #ifdef HAVE_XFT
2359 reinit_vars_of_font_mgr (); 2359 reinit_vars_of_font_mgr ();
2360 #endif 2360 #endif
2361 #endif /* HAVE_X_WINDOWS */ 2361 #endif /* HAVE_X_WINDOWS */
2362 2362
2363 #ifdef MULE 2363 #ifdef MULE
2426 objects and we have defined the basic coding systems (in the 2426 objects and we have defined the basic coding systems (in the
2427 just-previous complex-vars calls). We will in fact do conversion 2427 just-previous complex-vars calls). We will in fact do conversion
2428 quite soon, e.g. in complex_vars_of_glyphs_x(). */ 2428 quite soon, e.g. in complex_vars_of_glyphs_x(). */
2429 inhibit_non_essential_conversion_operations = 0; 2429 inhibit_non_essential_conversion_operations = 0;
2430 2430
2431 #ifdef USE_XFT 2431 #ifdef HAVE_XFT
2432 /* This uses coding systems. Must be done before faces are init'ed. */ 2432 /* This uses coding systems. Must be done before faces are init'ed. */
2433 /* not in xft reloaded #3 */ 2433 /* not in xft reloaded #3 */
2434 complex_vars_of_font_mgr (); 2434 complex_vars_of_font_mgr ();
2435 #endif 2435 #endif
2436 2436