comparison src/emacs.c @ 209:41ff10fd062f r20-4b3

Import from CVS: tag r20-4b3
author cvs
date Mon, 13 Aug 2007 10:04:58 +0200
parents e45d5e7c476e
children 78f53ef88e17
comparison
equal deleted inserted replaced
208:f427b8ec4379 209:41ff10fd062f
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
701 if (!noninteractive)
702 display_use = "w32";
703 #endif /* HAVE_W32GUI */
700 } 704 }
701 #endif /* HAVE_WINDOW_SYSTEM */ 705 #endif /* HAVE_WINDOW_SYSTEM */
702 706
703 noninteractive1 = noninteractive; 707 noninteractive1 = noninteractive;
704 708
873 #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)
874 syms_of_gui_x (); 878 syms_of_gui_x ();
875 #endif 879 #endif
876 #endif /* HAVE_X_WINDOWS */ 880 #endif /* HAVE_X_WINDOWS */
877 881
882 #ifdef HAVE_W32GUI
883 syms_of_console_w32 ();
884 syms_of_device_w32 ();
885 syms_of_event_w32 ();
886 syms_of_frame_w32 ();
887 syms_of_objects_w32 ();
888 #endif
889
878 #ifdef MULE 890 #ifdef MULE
879 syms_of_mule (); 891 syms_of_mule ();
880 syms_of_mule_ccl (); 892 syms_of_mule_ccl ();
881 syms_of_mule_charset (); 893 syms_of_mule_charset ();
882 syms_of_mule_coding (); 894 syms_of_mule_coding ();
959 #endif 971 #endif
960 #ifdef HAVE_TOOLBARS 972 #ifdef HAVE_TOOLBARS
961 console_type_create_toolbar_x (); 973 console_type_create_toolbar_x ();
962 #endif 974 #endif
963 #endif /* HAVE_X_WINDOWS */ 975 #endif /* HAVE_X_WINDOWS */
976
977 #ifdef HAVE_W32GUI
978 console_type_create_w32 ();
979 console_type_create_device_w32 ();
980 console_type_create_frame_w32 ();
981 console_type_create_objects_w32 ();
982 console_type_create_redisplay_w32 ();
983 #endif
964 984
965 /* Now initialize the specifier types and associated symbols. 985 /* Now initialize the specifier types and associated symbols.
966 Other than the first function below, the functions may 986 Other than the first function below, the functions may
967 make exactly the following function/macro calls: 987 make exactly the following function/macro calls:
968 988
1186 vars_of_scrollbar_x (); 1206 vars_of_scrollbar_x ();
1187 #endif 1207 #endif
1188 #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)
1189 vars_of_gui_x (); 1209 vars_of_gui_x ();
1190 #endif 1210 #endif
1211 #endif
1212
1213 #ifdef HAVE_W32GUI
1214 vars_of_device_w32 ();
1215 vars_of_console_w32 ();
1216 vars_of_event_w32 ();
1217 vars_of_frame_w32 ();
1218 vars_of_objects_w32 ();
1191 #endif 1219 #endif
1192 1220
1193 #ifdef MULE 1221 #ifdef MULE
1194 vars_of_mule (); 1222 vars_of_mule ();
1195 vars_of_mule_charset (); 1223 vars_of_mule_charset ();