comparison src/emacs.c @ 5180:4cd28c29a7a1

merge
author Ben Wing <ben@xemacs.org>
date Mon, 29 Mar 2010 22:52:01 -0500
parents 14fda1dbdb26 97eb4942aec8
children 5efbd1253905
comparison
equal deleted inserted replaced
5179:14fda1dbdb26 5180:4cd28c29a7a1
1585 syms_of_module (); 1585 syms_of_module ();
1586 #endif 1586 #endif
1587 #ifdef WITH_NUMBER_TYPES 1587 #ifdef WITH_NUMBER_TYPES
1588 syms_of_number (); 1588 syms_of_number ();
1589 #endif 1589 #endif
1590 syms_of_objects (); 1590 syms_of_fontcolor ();
1591 syms_of_print (); 1591 syms_of_print ();
1592 syms_of_process (); 1592 syms_of_process ();
1593 #ifdef HAVE_WIN32_PROCESSES 1593 #ifdef HAVE_WIN32_PROCESSES
1594 syms_of_process_nt (); 1594 syms_of_process_nt ();
1595 #endif 1595 #endif
1619 1619
1620 #ifdef HAVE_TTY 1620 #ifdef HAVE_TTY
1621 syms_of_console_tty (); 1621 syms_of_console_tty ();
1622 syms_of_device_tty (); 1622 syms_of_device_tty ();
1623 syms_of_frame_tty (); 1623 syms_of_frame_tty ();
1624 syms_of_objects_tty (); 1624 syms_of_fontcolor_tty ();
1625 #endif 1625 #endif
1626 1626
1627 #ifdef HAVE_GTK 1627 #ifdef HAVE_GTK
1628 syms_of_device_gtk (); 1628 syms_of_device_gtk ();
1629 syms_of_frame_gtk (); 1629 syms_of_frame_gtk ();
1630 syms_of_glyphs_gtk (); 1630 syms_of_glyphs_gtk ();
1631 syms_of_objects_gtk (); 1631 syms_of_fontcolor_gtk ();
1632 syms_of_ui_gtk (); 1632 syms_of_ui_gtk ();
1633 syms_of_select_gtk (); 1633 syms_of_select_gtk ();
1634 #ifdef HAVE_DIALOGS 1634 #ifdef HAVE_DIALOGS
1635 syms_of_dialog_gtk (); 1635 syms_of_dialog_gtk ();
1636 #endif 1636 #endif
1652 #ifdef HAVE_X_DIALOGS 1652 #ifdef HAVE_X_DIALOGS
1653 syms_of_dialog_x (); 1653 syms_of_dialog_x ();
1654 #endif 1654 #endif
1655 syms_of_frame_x (); 1655 syms_of_frame_x ();
1656 syms_of_glyphs_x (); 1656 syms_of_glyphs_x ();
1657 syms_of_objects_x (); 1657 syms_of_fontcolor_x ();
1658 #ifdef HAVE_MENUBARS 1658 #ifdef HAVE_MENUBARS
1659 syms_of_menubar_x (); 1659 syms_of_menubar_x ();
1660 #endif 1660 #endif
1661 syms_of_select_x (); 1661 syms_of_select_x ();
1662 #ifdef HAVE_GUI_OBJECTS 1662 #ifdef HAVE_GUI_OBJECTS
1681 syms_of_event_mswindows (); 1681 syms_of_event_mswindows ();
1682 #ifdef HAVE_DIALOGS 1682 #ifdef HAVE_DIALOGS
1683 syms_of_dialog_mswindows (); 1683 syms_of_dialog_mswindows ();
1684 #endif 1684 #endif
1685 syms_of_frame_mswindows (); 1685 syms_of_frame_mswindows ();
1686 syms_of_objects_mswindows (); 1686 syms_of_fontcolor_mswindows ();
1687 syms_of_select_mswindows (); 1687 syms_of_select_mswindows ();
1688 syms_of_glyphs_mswindows (); 1688 syms_of_glyphs_mswindows ();
1689 #ifdef HAVE_GUI_OBJECTS 1689 #ifdef HAVE_GUI_OBJECTS
1690 syms_of_gui_mswindows (); 1690 syms_of_gui_mswindows ();
1691 #endif 1691 #endif
1805 1805
1806 #ifdef HAVE_TTY 1806 #ifdef HAVE_TTY
1807 console_type_create_tty (); 1807 console_type_create_tty ();
1808 console_type_create_device_tty (); 1808 console_type_create_device_tty ();
1809 console_type_create_frame_tty (); 1809 console_type_create_frame_tty ();
1810 console_type_create_objects_tty (); 1810 console_type_create_fontcolor_tty ();
1811 console_type_create_redisplay_tty (); 1811 console_type_create_redisplay_tty ();
1812 #endif 1812 #endif
1813 1813
1814 #ifdef HAVE_GTK 1814 #ifdef HAVE_GTK
1815 console_type_create_gtk (); 1815 console_type_create_gtk ();
1816 console_type_create_select_gtk (); 1816 console_type_create_select_gtk ();
1817 console_type_create_device_gtk (); 1817 console_type_create_device_gtk ();
1818 console_type_create_frame_gtk (); 1818 console_type_create_frame_gtk ();
1819 console_type_create_objects_gtk (); 1819 console_type_create_fontcolor_gtk ();
1820 console_type_create_glyphs_gtk (); 1820 console_type_create_glyphs_gtk ();
1821 console_type_create_redisplay_gtk (); 1821 console_type_create_redisplay_gtk ();
1822 #ifdef HAVE_MENUBARS 1822 #ifdef HAVE_MENUBARS
1823 console_type_create_menubar_gtk (); 1823 console_type_create_menubar_gtk ();
1824 #endif 1824 #endif
1840 console_type_create_glyphs_x (); 1840 console_type_create_glyphs_x ();
1841 console_type_create_select_x (); 1841 console_type_create_select_x ();
1842 #ifdef HAVE_MENUBARS 1842 #ifdef HAVE_MENUBARS
1843 console_type_create_menubar_x (); 1843 console_type_create_menubar_x ();
1844 #endif 1844 #endif
1845 console_type_create_objects_x (); 1845 console_type_create_fontcolor_x ();
1846 console_type_create_redisplay_x (); 1846 console_type_create_redisplay_x ();
1847 #ifdef HAVE_SCROLLBARS 1847 #ifdef HAVE_SCROLLBARS
1848 console_type_create_scrollbar_x (); 1848 console_type_create_scrollbar_x ();
1849 #endif 1849 #endif
1850 #ifdef HAVE_TOOLBARS 1850 #ifdef HAVE_TOOLBARS
1857 1857
1858 #ifdef HAVE_MS_WINDOWS 1858 #ifdef HAVE_MS_WINDOWS
1859 console_type_create_mswindows (); 1859 console_type_create_mswindows ();
1860 console_type_create_device_mswindows (); 1860 console_type_create_device_mswindows ();
1861 console_type_create_frame_mswindows (); 1861 console_type_create_frame_mswindows ();
1862 console_type_create_objects_mswindows (); 1862 console_type_create_fontcolor_mswindows ();
1863 console_type_create_redisplay_mswindows (); 1863 console_type_create_redisplay_mswindows ();
1864 console_type_create_glyphs_mswindows (); 1864 console_type_create_glyphs_mswindows ();
1865 console_type_create_select_mswindows (); 1865 console_type_create_select_mswindows ();
1866 # ifdef HAVE_SCROLLBARS 1866 # ifdef HAVE_SCROLLBARS
1867 console_type_create_scrollbar_mswindows (); 1867 console_type_create_scrollbar_mswindows ();
1889 1889
1890 specifier_type_create (); 1890 specifier_type_create ();
1891 1891
1892 specifier_type_create_image (); 1892 specifier_type_create_image ();
1893 specifier_type_create_gutter (); 1893 specifier_type_create_gutter ();
1894 specifier_type_create_objects (); 1894 specifier_type_create_fontcolor ();
1895 #ifdef HAVE_TOOLBARS 1895 #ifdef HAVE_TOOLBARS
1896 specifier_type_create_toolbar (); 1896 specifier_type_create_toolbar ();
1897 #endif 1897 #endif
1898 1898
1899 /* Now initialize the coding system types and associated symbols. 1899 /* Now initialize the coding system types and associated symbols.
1964 #endif 1964 #endif
1965 1965
1966 reinit_specifier_type_create (); 1966 reinit_specifier_type_create ();
1967 reinit_specifier_type_create_image (); 1967 reinit_specifier_type_create_image ();
1968 reinit_specifier_type_create_gutter (); 1968 reinit_specifier_type_create_gutter ();
1969 reinit_specifier_type_create_objects (); 1969 reinit_specifier_type_create_fontcolor ();
1970 #ifdef HAVE_TOOLBARS 1970 #ifdef HAVE_TOOLBARS
1971 reinit_specifier_type_create_toolbar (); 1971 reinit_specifier_type_create_toolbar ();
1972 #endif 1972 #endif
1973 1973
1974 reinit_coding_system_type_create (); 1974 reinit_coding_system_type_create ();
2188 vars_of_nt (); 2188 vars_of_nt ();
2189 #endif 2189 #endif
2190 #ifdef WITH_NUMBER_TYPES 2190 #ifdef WITH_NUMBER_TYPES
2191 vars_of_number (); 2191 vars_of_number ();
2192 #endif 2192 #endif
2193 vars_of_objects (); 2193 vars_of_fontcolor ();
2194 vars_of_print (); 2194 vars_of_print ();
2195 2195
2196 vars_of_process (); 2196 vars_of_process ();
2197 #ifdef HAVE_UNIX_PROCESSES 2197 #ifdef HAVE_UNIX_PROCESSES
2198 vars_of_process_unix (); 2198 vars_of_process_unix ();
2227 #endif 2227 #endif
2228 2228
2229 #ifdef HAVE_TTY 2229 #ifdef HAVE_TTY
2230 vars_of_console_tty (); 2230 vars_of_console_tty ();
2231 vars_of_frame_tty (); 2231 vars_of_frame_tty ();
2232 vars_of_objects_tty (); 2232 vars_of_fontcolor_tty ();
2233 #endif 2233 #endif
2234 2234
2235 #ifdef HAVE_GTK 2235 #ifdef HAVE_GTK
2236 vars_of_device_gtk (); 2236 vars_of_device_gtk ();
2237 vars_of_console_gtk (); 2237 vars_of_console_gtk ();
2243 vars_of_glyphs_gtk (); 2243 vars_of_glyphs_gtk ();
2244 vars_of_ui_gtk (); 2244 vars_of_ui_gtk ();
2245 #ifdef HAVE_MENUBARS 2245 #ifdef HAVE_MENUBARS
2246 vars_of_menubar_gtk (); 2246 vars_of_menubar_gtk ();
2247 #endif 2247 #endif
2248 vars_of_objects_gtk (); 2248 vars_of_fontcolor_gtk ();
2249 vars_of_select_gtk (); 2249 vars_of_select_gtk ();
2250 #ifdef HAVE_SCROLLBARS 2250 #ifdef HAVE_SCROLLBARS
2251 vars_of_scrollbar_gtk (); 2251 vars_of_scrollbar_gtk ();
2252 #endif 2252 #endif
2253 #if defined (HAVE_MENUBARS) || defined (HAVE_SCROLLBARS) || defined (HAVE_DIALOGS) || defined (HAVE_TOOLBARS) 2253 #if defined (HAVE_MENUBARS) || defined (HAVE_SCROLLBARS) || defined (HAVE_DIALOGS) || defined (HAVE_TOOLBARS)
2267 vars_of_frame_x (); 2267 vars_of_frame_x ();
2268 vars_of_glyphs_x (); 2268 vars_of_glyphs_x ();
2269 #ifdef HAVE_MENUBARS 2269 #ifdef HAVE_MENUBARS
2270 vars_of_menubar_x (); 2270 vars_of_menubar_x ();
2271 #endif 2271 #endif
2272 vars_of_objects_x (); 2272 vars_of_fontcolor_x ();
2273 vars_of_select_x (); 2273 vars_of_select_x ();
2274 #ifdef HAVE_SCROLLBARS 2274 #ifdef HAVE_SCROLLBARS
2275 vars_of_scrollbar_x (); 2275 vars_of_scrollbar_x ();
2276 #endif 2276 #endif
2277 #if defined (HAVE_MENUBARS) || defined (HAVE_SCROLLBARS) || defined (HAVE_X_DIALOGS) || defined (HAVE_TOOLBARS) 2277 #if defined (HAVE_MENUBARS) || defined (HAVE_SCROLLBARS) || defined (HAVE_X_DIALOGS) || defined (HAVE_TOOLBARS)
2287 2287
2288 #ifdef HAVE_MS_WINDOWS 2288 #ifdef HAVE_MS_WINDOWS
2289 vars_of_device_mswindows (); 2289 vars_of_device_mswindows ();
2290 vars_of_console_mswindows (); 2290 vars_of_console_mswindows ();
2291 vars_of_frame_mswindows (); 2291 vars_of_frame_mswindows ();
2292 vars_of_objects_mswindows (); 2292 vars_of_fontcolor_mswindows ();
2293 vars_of_select_mswindows (); 2293 vars_of_select_mswindows ();
2294 vars_of_glyphs_mswindows (); 2294 vars_of_glyphs_mswindows ();
2295 #ifdef HAVE_SCROLLBARS 2295 #ifdef HAVE_SCROLLBARS
2296 vars_of_scrollbar_mswindows (); 2296 vars_of_scrollbar_mswindows ();
2297 #endif 2297 #endif
2376 #endif /* not NEW_GC */ 2376 #endif /* not NEW_GC */
2377 reinit_vars_of_minibuf (); 2377 reinit_vars_of_minibuf ();
2378 #ifdef HAVE_SHLIB 2378 #ifdef HAVE_SHLIB
2379 reinit_vars_of_module (); 2379 reinit_vars_of_module ();
2380 #endif 2380 #endif
2381 reinit_vars_of_objects (); 2381 reinit_vars_of_fontcolor ();
2382 reinit_vars_of_print (); 2382 reinit_vars_of_print ();
2383 reinit_vars_of_search (); 2383 reinit_vars_of_search ();
2384 reinit_vars_of_text (); 2384 reinit_vars_of_text ();
2385 reinit_vars_of_undo (); 2385 reinit_vars_of_undo ();
2386 reinit_vars_of_window (); 2386 reinit_vars_of_window ();
2387 2387
2388 #ifdef HAVE_MS_WINDOWS 2388 #ifdef HAVE_MS_WINDOWS
2389 reinit_vars_of_event_mswindows (); 2389 reinit_vars_of_event_mswindows ();
2390 reinit_vars_of_frame_mswindows (); 2390 reinit_vars_of_frame_mswindows ();
2391 reinit_vars_of_object_mswindows (); 2391 reinit_vars_of_fontcolor_mswindows ();
2392 #endif 2392 #endif
2393 2393
2394 #ifdef HAVE_GTK 2394 #ifdef HAVE_GTK
2395 reinit_vars_of_event_gtk (); 2395 reinit_vars_of_event_gtk ();
2396 reinit_vars_of_menubar_gtk (); 2396 reinit_vars_of_menubar_gtk ();