comparison src/emacs.c @ 278:90d73dddcdc4 r21-0b37

Import from CVS: tag r21-0b37
author cvs
date Mon, 13 Aug 2007 10:31:29 +0200
parents 6330739388db
children 7df0dd720c89
comparison
equal deleted inserted replaced
277:cfdf3ff11843 278:90d73dddcdc4
107 /* Version numbers and strings */ 107 /* Version numbers and strings */
108 Lisp_Object Vemacs_major_version; 108 Lisp_Object Vemacs_major_version;
109 Lisp_Object Vemacs_minor_version; 109 Lisp_Object Vemacs_minor_version;
110 Lisp_Object Vemacs_beta_version; 110 Lisp_Object Vemacs_beta_version;
111 Lisp_Object Vxemacs_codename; 111 Lisp_Object Vxemacs_codename;
112 #ifdef INFODOCK
113 Lisp_Object Vinfodock_major_version;
114 Lisp_Object Vinfodock_minor_version;
115 Lisp_Object Vinfodock_build_version;
116 #endif
112 117
113 /* The path under which XEmacs was invoked. */ 118 /* The path under which XEmacs was invoked. */
114 Lisp_Object Vinvocation_path; 119 Lisp_Object Vinvocation_path;
115 120
116 /* The name under which XEmacs was invoked, with any leading directory 121 /* The name under which XEmacs was invoked, with any leading directory
138 Lisp_Object Vsite_directory, Vconfigure_site_directory; 143 Lisp_Object Vsite_directory, Vconfigure_site_directory;
139 Lisp_Object Vconfigure_info_path; 144 Lisp_Object Vconfigure_info_path;
140 Lisp_Object Vinternal_error_checking; 145 Lisp_Object Vinternal_error_checking;
141 146
142 /* The default base directory XEmacs is installed under. */ 147 /* The default base directory XEmacs is installed under. */
143 Lisp_Object Vconfigure_prefix_directory; 148 Lisp_Object Vconfigure_exec_prefix_directory, Vconfigure_prefix_directory;
144 149
145 /* If nonzero, set XEmacs to run at this priority. This is also used 150 /* If nonzero, set XEmacs to run at this priority. This is also used
146 in child_setup and sys_suspend to make sure subshells run at normal 151 in child_setup and sys_suspend to make sure subshells run at normal
147 priority. */ 152 priority. */
148 int emacs_priority; 153 int emacs_priority;
896 syms_of_fns (); 901 syms_of_fns ();
897 syms_of_font_lock (); 902 syms_of_font_lock ();
898 syms_of_frame (); 903 syms_of_frame ();
899 syms_of_general (); 904 syms_of_general ();
900 syms_of_glyphs (); 905 syms_of_glyphs ();
906 syms_of_glyphs_read ();
901 #if defined (HAVE_MENUBARS) || defined (HAVE_SCROLLBARS) || defined (HAVE_DIALOGS) || defined (HAVE_TOOLBARS) 907 #if defined (HAVE_MENUBARS) || defined (HAVE_SCROLLBARS) || defined (HAVE_DIALOGS) || defined (HAVE_TOOLBARS)
902 syms_of_gui (); 908 syms_of_gui ();
903 #endif 909 #endif
904 syms_of_indent (); 910 syms_of_indent ();
905 syms_of_intl (); 911 syms_of_intl ();
1141 1147
1142 For any given image instantiator format, the first macro must be 1148 For any given image instantiator format, the first macro must be
1143 called before the any calls to the other macros. */ 1149 called before the any calls to the other macros. */
1144 1150
1145 image_instantiator_format_create (); 1151 image_instantiator_format_create ();
1152 image_instantiator_format_create_glyphs_read ();
1146 #ifdef HAVE_X_WINDOWS 1153 #ifdef HAVE_X_WINDOWS
1147 image_instantiator_format_create_glyphs_x (); 1154 image_instantiator_format_create_glyphs_x ();
1148 #endif /* HAVE_X_WINDOWS */ 1155 #endif /* HAVE_X_WINDOWS */
1149 #ifdef HAVE_MS_WINDOWS 1156 #ifdef HAVE_MS_WINDOWS
1150 image_instantiator_format_create_glyphs_mswindows (); 1157 image_instantiator_format_create_glyphs_mswindows ();
1160 1167
1161 lstream_type_create (); 1168 lstream_type_create ();
1162 #ifdef FILE_CODING 1169 #ifdef FILE_CODING
1163 lstream_type_create_mule_coding (); 1170 lstream_type_create_mule_coding ();
1164 #endif 1171 #endif
1165 #ifdef HAVE_MS_WINDOWS 1172 #if defined (HAVE_MS_WINDOWS) && !defined(HAVE_MSG_SELECT)
1166 lstream_type_create_mswindows_selectable (); 1173 lstream_type_create_mswindows_selectable ();
1167 #endif 1174 #endif
1168 1175
1169 /* Initialize processes implementation. 1176 /* Initialize processes implementation.
1170 The functions may make exactly the following function/macro calls: 1177 The functions may make exactly the following function/macro calls:
1259 #endif 1266 #endif
1260 vars_of_floatfns (); 1267 vars_of_floatfns ();
1261 vars_of_font_lock (); 1268 vars_of_font_lock ();
1262 vars_of_frame (); 1269 vars_of_frame ();
1263 vars_of_glyphs (); 1270 vars_of_glyphs ();
1271 vars_of_glyphs_read ();
1264 #if defined (HAVE_MENUBARS) || defined (HAVE_SCROLLBARS) || defined (HAVE_DIALOGS) || defined (HAVE_TOOLBARS) 1272 #if defined (HAVE_MENUBARS) || defined (HAVE_SCROLLBARS) || defined (HAVE_DIALOGS) || defined (HAVE_TOOLBARS)
1265 vars_of_gui (); 1273 vars_of_gui ();
1266 #endif 1274 #endif
1267 vars_of_indent (); 1275 vars_of_indent ();
1268 vars_of_insdel (); 1276 vars_of_insdel ();
2666 Vemacs_beta_version = make_int (EMACS_BETA_VERSION); 2674 Vemacs_beta_version = make_int (EMACS_BETA_VERSION);
2667 #else 2675 #else
2668 Vemacs_beta_version = Qnil; 2676 Vemacs_beta_version = Qnil;
2669 #endif 2677 #endif
2670 2678
2679 #ifdef INFODOCK
2680 DEFVAR_LISP ("infodock-major-version", &Vinfodock_major_version /*
2681 Major version number of this InfoDock release.
2682 */ );
2683 Vinfodock_major_version = make_int (INFODOCK_MAJOR_VERSION);
2684
2685 DEFVAR_LISP ("infodock-minor-version", &Vinfodock_minor_version /*
2686 Minor version number of this InfoDock release.
2687 */ );
2688 Vinfodock_minor_version = make_int (INFODOCK_MINOR_VERSION);
2689
2690 DEFVAR_LISP ("infodock-build-version", &Vinfodock_build_version /*
2691 Build version of this InfoDock release.
2692 */ );
2693 Vinfodock_build_version = make_int (INFODOCK_BUILD_VERSION);
2694 #endif
2695
2671 DEFVAR_LISP ("xemacs-codename", &Vxemacs_codename /* 2696 DEFVAR_LISP ("xemacs-codename", &Vxemacs_codename /*
2672 Codename of this version of Emacs (a string). 2697 Codename of this version of Emacs (a string).
2673 */ ); 2698 */ );
2674 #ifndef XEMACS_CODENAME 2699 #ifndef XEMACS_CODENAME
2675 #define XEMACS_CODENAME "Noname" 2700 #define XEMACS_CODENAME "Noname"
2786 Vconfigure_lisp_directory = Qnil; 2811 Vconfigure_lisp_directory = Qnil;
2787 #endif 2812 #endif
2788 2813
2789 DEFVAR_LISP ("configure-package-path", &Vconfigure_package_path /* 2814 DEFVAR_LISP ("configure-package-path", &Vconfigure_package_path /*
2790 For internal use by the build procedure only. 2815 For internal use by the build procedure only.
2791 configure's idea of what PACKAGE-DIRECTORY will be. 2816 configure's idea of what the package path will be.
2792 */ ); 2817 */ );
2793 #ifdef PATH_PACKAGEPATH 2818 #ifdef PATH_PACKAGEPATH
2794 Vconfigure_package_path = decode_path (PATH_PACKAGEPATH); 2819 Vconfigure_package_path = decode_path (PATH_PACKAGEPATH);
2795 #else 2820 #else
2796 Vconfigure_package_path = Qnil; 2821 Vconfigure_package_path = Qnil;
2865 (build_string ((char *) PATH_DOC)); 2890 (build_string ((char *) PATH_DOC));
2866 #else 2891 #else
2867 Vconfigure_doc_directory = Qnil; 2892 Vconfigure_doc_directory = Qnil;
2868 #endif 2893 #endif
2869 2894
2895 DEFVAR_LISP ("configure-exec-prefix-directory", &Vconfigure_exec_prefix_directory /*
2896 For internal use by the build procedure only.
2897 configure's idea of what EXEC-PREFIX-DIRECTORY will be.
2898 */ );
2899 #ifdef PATH_EXEC_PREFIX
2900 Vconfigure_exec_prefix_directory = Ffile_name_as_directory
2901 (build_string ((char *) PATH_EXEC_PREFIX));
2902 #else
2903 Vconfigure_exec_prefix_directory = Qnil;
2904 #endif
2905
2870 DEFVAR_LISP ("configure-prefix-directory", &Vconfigure_prefix_directory /* 2906 DEFVAR_LISP ("configure-prefix-directory", &Vconfigure_prefix_directory /*
2871 For internal use by the build procedure only. 2907 For internal use by the build procedure only.
2872 configure's idea of what PREFIX-DIRECTORY will be. 2908 configure's idea of what PREFIX-DIRECTORY will be.
2873 */ ); 2909 */ );
2874 #ifdef PATH_PREFIX 2910 #ifdef PATH_PREFIX