Mercurial > hg > xemacs-beta

comparison src/emacs.c @ 4969:cbe181529c34

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Automatic merge
author Ben Wing <ben@xemacs.org>
date Wed, 03 Feb 2010 21:46:21 -0600
parents 304aebb79cd3 8934492a0e97
children 3bf1b0f0c391 16112448d484 4aebb0131297
comparison
equal deleted inserted replaced
4968:4d35e52790f8 4969:cbe181529c34
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
2223 #endif 2223 #endif
2224 #if defined (HAVE_MENUBARS) || defined (HAVE_SCROLLBARS) || defined (HAVE_X_DIALOGS) || defined (HAVE_TOOLBARS) 2224 #if defined (HAVE_MENUBARS) || defined (HAVE_SCROLLBARS) || defined (HAVE_X_DIALOGS) || defined (HAVE_TOOLBARS)
2225 vars_of_gui_x (); 2225 vars_of_gui_x ();
2226 #endif 2226 #endif
2227 2227
2228 #ifdef USE_XFT 2228 #ifdef HAVE_XFT
2229 vars_of_font_mgr (); 2229 vars_of_font_mgr ();
2230 #endif 2230 #endif
2231 2231
2232 #endif /* HAVE_X_WINDOWS */ 2232 #endif /* HAVE_X_WINDOWS */
2233 2233
2294 ) 2294 )
2295 { 2295 {
2296 /* Now do additional vars_of_*() initialization that happens both 2296 /* Now do additional vars_of_*() initialization that happens both
2297 at dump time and after pdump load. */ 2297 at dump time and after pdump load. */
2298 reinit_vars_of_buffer (); 2298 reinit_vars_of_buffer ();
2299 reinit_vars_of_bytecode ();
2299 reinit_vars_of_console (); 2300 reinit_vars_of_console ();
2300 #ifdef DEBUG_XEMACS 2301 #ifdef DEBUG_XEMACS
2301 reinit_vars_of_debug (); 2302 reinit_vars_of_debug ();
2302 #endif 2303 #endif
2303 reinit_vars_of_device (); 2304 reinit_vars_of_device ();
2353 #endif 2354 #endif
2354 reinit_vars_of_select_x (); 2355 reinit_vars_of_select_x ();
2355 #if defined (HAVE_MENUBARS) || defined (HAVE_SCROLLBARS) || defined (HAVE_X_DIALOGS) || defined (HAVE_TOOLBARS) 2356 #if defined (HAVE_MENUBARS) || defined (HAVE_SCROLLBARS) || defined (HAVE_X_DIALOGS) || defined (HAVE_TOOLBARS)
2356 reinit_vars_of_gui_x (); 2357 reinit_vars_of_gui_x ();
2357 #endif 2358 #endif
2358 #ifdef USE_XFT 2359 #ifdef HAVE_XFT
2359 reinit_vars_of_font_mgr (); 2360 reinit_vars_of_font_mgr ();
2360 #endif 2361 #endif
2361 #endif /* HAVE_X_WINDOWS */ 2362 #endif /* HAVE_X_WINDOWS */
2362 2363
2363 #ifdef MULE 2364 #ifdef MULE
2426 objects and we have defined the basic coding systems (in the 2427 objects and we have defined the basic coding systems (in the
2427 just-previous complex-vars calls). We will in fact do conversion 2428 just-previous complex-vars calls). We will in fact do conversion
2428 quite soon, e.g. in complex_vars_of_glyphs_x(). */ 2429 quite soon, e.g. in complex_vars_of_glyphs_x(). */
2429 inhibit_non_essential_conversion_operations = 0; 2430 inhibit_non_essential_conversion_operations = 0;
2430 2431
2431 #ifdef USE_XFT 2432 #ifdef HAVE_XFT
2432 /* This uses coding systems. Must be done before faces are init'ed. */ 2433 /* This uses coding systems. Must be done before faces are init'ed. */
2433 /* not in xft reloaded #3 */ 2434 /* not in xft reloaded #3 */
2434 complex_vars_of_font_mgr (); 2435 complex_vars_of_font_mgr ();
2435 #endif 2436 #endif
2436 2437