Mercurial > hg > xemacs-beta
comparison src/emacs.c @ 213:78f53ef88e17 r20-4b5
Import from CVS: tag r20-4b5
author | cvs |
---|---|
date | Mon, 13 Aug 2007 10:06:47 +0200 |
parents | 41ff10fd062f |
children | 1f0dabaa0855 |
comparison
equal
deleted
inserted
replaced
212:d8688acf4c5b | 213:78f53ef88e17 |
---|---|
695 if the display was specified on the command line. */ | 695 if the display was specified on the command line. */ |
696 if ((dpy = getenv ("DISPLAY")) && dpy[0]) | 696 if ((dpy = getenv ("DISPLAY")) && dpy[0]) |
697 display_use = "x"; | 697 display_use = "x"; |
698 | 698 |
699 #endif /* HAVE_X_WINDOWS */ | 699 #endif /* HAVE_X_WINDOWS */ |
700 #ifdef HAVE_W32GUI | 700 #ifdef HAVE_MS_WINDOWS |
701 if (!noninteractive) | 701 if (!noninteractive) |
702 display_use = "w32"; | 702 display_use = "mswindows"; |
703 #endif /* HAVE_W32GUI */ | 703 #endif /* HAVE_MS_WINDOWS */ |
704 } | 704 } |
705 #endif /* HAVE_WINDOW_SYSTEM */ | 705 #endif /* HAVE_WINDOW_SYSTEM */ |
706 | 706 |
707 noninteractive1 = noninteractive; | 707 noninteractive1 = noninteractive; |
708 | 708 |
877 #if defined (HAVE_MENUBARS) || defined (HAVE_SCROLLBARS) || defined (HAVE_DIALOGS) || defined (HAVE_TOOLBARS) | 877 #if defined (HAVE_MENUBARS) || defined (HAVE_SCROLLBARS) || defined (HAVE_DIALOGS) || defined (HAVE_TOOLBARS) |
878 syms_of_gui_x (); | 878 syms_of_gui_x (); |
879 #endif | 879 #endif |
880 #endif /* HAVE_X_WINDOWS */ | 880 #endif /* HAVE_X_WINDOWS */ |
881 | 881 |
882 #ifdef HAVE_W32GUI | 882 #ifdef HAVE_MS_WINDOWS |
883 syms_of_console_w32 (); | 883 syms_of_console_mswindows (); |
884 syms_of_device_w32 (); | 884 syms_of_device_mswindows (); |
885 syms_of_event_w32 (); | 885 syms_of_event_mswindows (); |
886 syms_of_frame_w32 (); | 886 syms_of_frame_mswindows (); |
887 syms_of_objects_w32 (); | 887 syms_of_objects_mswindows (); |
888 #endif | 888 #endif |
889 | 889 |
890 #ifdef MULE | 890 #ifdef MULE |
891 syms_of_mule (); | 891 syms_of_mule (); |
892 syms_of_mule_ccl (); | 892 syms_of_mule_ccl (); |
972 #ifdef HAVE_TOOLBARS | 972 #ifdef HAVE_TOOLBARS |
973 console_type_create_toolbar_x (); | 973 console_type_create_toolbar_x (); |
974 #endif | 974 #endif |
975 #endif /* HAVE_X_WINDOWS */ | 975 #endif /* HAVE_X_WINDOWS */ |
976 | 976 |
977 #ifdef HAVE_W32GUI | 977 #ifdef HAVE_MS_WINDOWS |
978 console_type_create_w32 (); | 978 console_type_create_mswindows (); |
979 console_type_create_device_w32 (); | 979 console_type_create_device_mswindows (); |
980 console_type_create_frame_w32 (); | 980 console_type_create_frame_mswindows (); |
981 console_type_create_objects_w32 (); | 981 console_type_create_objects_mswindows (); |
982 console_type_create_redisplay_w32 (); | 982 console_type_create_redisplay_mswindows (); |
983 #endif | 983 #endif |
984 | 984 |
985 /* Now initialize the specifier types and associated symbols. | 985 /* Now initialize the specifier types and associated symbols. |
986 Other than the first function below, the functions may | 986 Other than the first function below, the functions may |
987 make exactly the following function/macro calls: | 987 make exactly the following function/macro calls: |
1208 #if defined (HAVE_MENUBARS) || defined (HAVE_SCROLLBARS) || defined (HAVE_DIALOGS) || defined (HAVE_TOOLBARS) | 1208 #if defined (HAVE_MENUBARS) || defined (HAVE_SCROLLBARS) || defined (HAVE_DIALOGS) || defined (HAVE_TOOLBARS) |
1209 vars_of_gui_x (); | 1209 vars_of_gui_x (); |
1210 #endif | 1210 #endif |
1211 #endif | 1211 #endif |
1212 | 1212 |
1213 #ifdef HAVE_W32GUI | 1213 #ifdef HAVE_MS_WINDOWS |
1214 vars_of_device_w32 (); | 1214 vars_of_device_mswindows (); |
1215 vars_of_console_w32 (); | 1215 vars_of_console_mswindows (); |
1216 vars_of_event_w32 (); | 1216 vars_of_event_mswindows (); |
1217 vars_of_frame_w32 (); | 1217 vars_of_frame_mswindows (); |
1218 vars_of_objects_w32 (); | 1218 vars_of_objects_mswindows (); |
1219 #endif | 1219 #endif |
1220 | 1220 |
1221 #ifdef MULE | 1221 #ifdef MULE |
1222 vars_of_mule (); | 1222 vars_of_mule (); |
1223 vars_of_mule_charset (); | 1223 vars_of_mule_charset (); |