Mercurial > hg > xemacs-beta

comparison src/emacs.c @ 3094:ad2f4ae9895b

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
[xemacs-hg @ 2005-11-26 11:45:47 by stephent] Xft merge. <87k6ev4p8q.fsf@tleepslib.sk.tsukuba.ac.jp>
author stephent
date Sat, 26 Nov 2005 11:46:25 +0000
parents 141c2920ea48
children 15139dbf89f4
comparison
equal deleted inserted replaced
3093:769dc945b085 3094:ad2f4ae9895b
1019 /* Handle the -si/--show-inline-info switch, which means show the 1019 /* Handle the -si/--show-inline-info switch, which means show the
1020 alignment and max size of the inline data and quit */ 1020 alignment and max size of the inline data and quit */
1021 if (argmatch (argv, argc, "-si", "--show-inline-info", 0, NULL, &skip_args)) 1021 if (argmatch (argv, argc, "-si", "--show-inline-info", 0, NULL, &skip_args))
1022 { 1022 {
1023 #if defined (PDUMP) && defined (DUMP_IN_EXEC) && !defined (WIN32_NATIVE) 1023 #if defined (PDUMP) && defined (DUMP_IN_EXEC) && !defined (WIN32_NATIVE)
1024 printf ("%u %u\n", dumped_data_max_size (), dumped_data_align_offset ()); 1024 /* #### We really should check for sizeof (size_t) > sizeof (long) */
1025 printf ("%lu %lu\n", (unsigned long) dumped_data_max_size (),
1026 (unsigned long) dumped_data_align_offset ());
1027
1025 #else 1028 #else
1026 printf ("Portable dumper not configured for dumping into executable or windows native; -si just forces exit.\n"); 1029 printf ("Portable dumper not configured for dumping into executable or windows native; -si just forces exit.\n");
1027 #endif 1030 #endif
1028 exit (0); 1031 exit (0);
1029 } 1032 }
1610 #ifdef HAVE_XIM 1613 #ifdef HAVE_XIM
1611 #ifdef XIM_XLIB 1614 #ifdef XIM_XLIB
1612 syms_of_input_method_xlib (); 1615 syms_of_input_method_xlib ();
1613 #endif 1616 #endif
1614 #endif /* HAVE_XIM */ 1617 #endif /* HAVE_XIM */
1618
1619 #ifdef USE_XFT
1620 syms_of_xft_fonts();
1621 #endif
1622
1615 #endif /* HAVE_X_WINDOWS */ 1623 #endif /* HAVE_X_WINDOWS */
1616 1624
1617 #ifdef HAVE_MS_WINDOWS 1625 #ifdef HAVE_MS_WINDOWS
1618 syms_of_console_mswindows (); 1626 syms_of_console_mswindows ();
1619 syms_of_device_mswindows (); 1627 syms_of_device_mswindows ();
2190 vars_of_scrollbar_x (); 2198 vars_of_scrollbar_x ();
2191 #endif 2199 #endif
2192 #if defined (HAVE_MENUBARS) || defined (HAVE_SCROLLBARS) || defined (HAVE_X_DIALOGS) || defined (HAVE_TOOLBARS) 2200 #if defined (HAVE_MENUBARS) || defined (HAVE_SCROLLBARS) || defined (HAVE_X_DIALOGS) || defined (HAVE_TOOLBARS)
2193 vars_of_gui_x (); 2201 vars_of_gui_x ();
2194 #endif 2202 #endif
2203
2204 #ifdef USE_XFT
2205 vars_of_xft_fonts ();
2206 #endif
2207
2195 #endif /* HAVE_X_WINDOWS */ 2208 #endif /* HAVE_X_WINDOWS */
2196 2209
2197 2210
2198 #ifdef HAVE_MS_WINDOWS 2211 #ifdef HAVE_MS_WINDOWS
2199 vars_of_device_mswindows (); 2212 vars_of_device_mswindows ();
2316 #endif 2329 #endif
2317 reinit_vars_of_select_x (); 2330 reinit_vars_of_select_x ();
2318 #if defined (HAVE_MENUBARS) || defined (HAVE_SCROLLBARS) || defined (HAVE_X_DIALOGS) || defined (HAVE_TOOLBARS) 2331 #if defined (HAVE_MENUBARS) || defined (HAVE_SCROLLBARS) || defined (HAVE_X_DIALOGS) || defined (HAVE_TOOLBARS)
2319 reinit_vars_of_gui_x (); 2332 reinit_vars_of_gui_x ();
2320 #endif 2333 #endif
2334 #ifdef USE_XFT
2335 reinit_vars_of_xft_fonts ();
2336 #endif
2321 #endif /* HAVE_X_WINDOWS */ 2337 #endif /* HAVE_X_WINDOWS */
2322 2338
2323 #ifdef MULE 2339 #ifdef MULE
2324 reinit_vars_of_mule_coding (); 2340 reinit_vars_of_mule_coding ();
2325 #endif 2341 #endif
2382 We have initialized things to the point that we can create Lisp 2398 We have initialized things to the point that we can create Lisp
2383 objects and we have defined the basic coding systems (in the 2399 objects and we have defined the basic coding systems (in the
2384 just-previous complex-vars calls). We will in fact do conversion 2400 just-previous complex-vars calls). We will in fact do conversion
2385 quite soon, e.g. in complex_vars_of_glyphs_x(). */ 2401 quite soon, e.g. in complex_vars_of_glyphs_x(). */
2386 inhibit_non_essential_conversion_operations = 0; 2402 inhibit_non_essential_conversion_operations = 0;
2403
2404 #ifdef USE_XFT
2405 /* This uses coding systems. Must be done before faces are init'ed. */
2406 /* not in xft reloaded #3 */
2407 complex_vars_of_xft_fonts ();
2408 #endif
2387 2409
2388 /* Depends on specifiers. */ 2410 /* Depends on specifiers. */
2389 complex_vars_of_faces (); 2411 complex_vars_of_faces ();
2390 2412
2391 /* This calls allocate_glyph(), which creates specifiers 2413 /* This calls allocate_glyph(), which creates specifiers