comparison src/emacs.c @ 165:5a88923fcbfe r20-3b9

Import from CVS: tag r20-3b9
author cvs
date Mon, 13 Aug 2007 09:44:42 +0200
parents 0132846995bd
children 85ec50267440
comparison
equal deleted inserted replaced
164:4e0740e5aab2 165:5a88923fcbfe
82 Lisp_Object Vsystem_type; 82 Lisp_Object Vsystem_type;
83 83
84 /* Variable whose value is string giving configuration built for. */ 84 /* Variable whose value is string giving configuration built for. */
85 Lisp_Object Vsystem_configuration; 85 Lisp_Object Vsystem_configuration;
86 86
87 /* Version numbers and strings */
88 Lisp_Object Vemacs_major_version;
89 Lisp_Object Vemacs_minor_version;
90 Lisp_Object Vemacs_beta_version;
91 Lisp_Object Vxemacs_codename;
92
87 /* The name under which XEmacs was invoked, with any leading directory 93 /* The name under which XEmacs was invoked, with any leading directory
88 names discarded. */ 94 names discarded. */
89 Lisp_Object Vinvocation_name; 95 Lisp_Object Vinvocation_name;
90 96
91 /* The directory name from which XEmacs was invoked. */ 97 /* The directory name from which XEmacs was invoked. */
124 130
125 #ifdef USG_SHARED_LIBRARIES 131 #ifdef USG_SHARED_LIBRARIES
126 /* If nonzero, this is the place to put the end of the writable segment 132 /* If nonzero, this is the place to put the end of the writable segment
127 at startup. */ 133 at startup. */
128 134
129 unsigned int bss_end = 0; 135 uintptr_t bss_end = 0;
130 #endif 136 #endif
131 137
132 /* Number of bytes of writable memory we can expect to be able to get */ 138 /* Number of bytes of writable memory we can expect to be able to get */
133 unsigned int lim_data; 139 unsigned int lim_data;
134 140
2114 It's a whole lot easier to do the conversion here than to 2120 It's a whole lot easier to do the conversion here than to
2115 modify all the unexec routines to ensure that filename 2121 modify all the unexec routines to ensure that filename
2116 conversion is applied everywhere. Don't worry about memory 2122 conversion is applied everywhere. Don't worry about memory
2117 leakage because this call only happens once. */ 2123 leakage because this call only happens once. */
2118 unexec ((char *) intoname_ext, (char *) symname_ext, 2124 unexec ((char *) intoname_ext, (char *) symname_ext,
2119 (unsigned int) &my_edata, 2125 (uintptr_t) &my_edata,
2120 0, 0); 2126 0, 0);
2121 } 2127 }
2122 #endif /* not MSDOS and EMX */ 2128 #endif /* not MSDOS and EMX */
2123 #endif /* not VMS */ 2129 #endif /* not VMS */
2124 2130
2297 DEFVAR_LISP ("system-configuration", &Vsystem_configuration /* 2303 DEFVAR_LISP ("system-configuration", &Vsystem_configuration /*
2298 Value is string indicating configuration XEmacs was built for. 2304 Value is string indicating configuration XEmacs was built for.
2299 */ ); 2305 */ );
2300 Vsystem_configuration = Fpurecopy (build_string (EMACS_CONFIGURATION)); 2306 Vsystem_configuration = Fpurecopy (build_string (EMACS_CONFIGURATION));
2301 2307
2302 DEFVAR_INT ("emacs-beta-version", &emacs_beta_version /* 2308 DEFVAR_LISP ("emacs-major-version", &Vemacs_major_version /*
2309 Major version number of this version of Emacs, as an integer.
2310 Warning: this variable did not exist in Emacs versions earlier than:
2311 FSF Emacs: 19.23
2312 XEmacs: 19.10
2313 */ );
2314 Vemacs_major_version = make_int (EMACS_MAJOR_VERSION);
2315
2316 DEFVAR_LISP ("emacs-minor-version", &Vemacs_minor_version /*
2317 Minor version number of this version of Emacs, as an integer.
2318 Warning: this variable did not exist in Emacs versions earlier than:
2319 FSF Emacs: 19.23
2320 XEmacs: 19.10
2321 */ );
2322 Vemacs_minor_version = make_int (EMACS_MINOR_VERSION);
2323
2324 DEFVAR_LISP ("emacs-beta-version", &Vemacs_beta_version /*
2303 Beta number of this version of Emacs, as an integer. 2325 Beta number of this version of Emacs, as an integer.
2304 The value is nil if this is an officially released version of XEmacs. 2326 The value is nil if this is an officially released version of XEmacs.
2305 Warning: this variable does not exist in FSF Emacs or in XEmacs versions 2327 Warning: this variable does not exist in FSF Emacs or in XEmacs versions
2306 earlier than 20.3. 2328 earlier than 20.3.
2307 */ ); 2329 */ );
2308 #ifndef EMACS_BETA_VERSION 2330 #ifdef EMACS_BETA_VERSION
2309 #define EMACS_BETA_VERSION Qnil 2331 Vemacs_beta_version = make_int (EMACS_BETA_VERSION);
2310 #endif 2332 #else
2311 emacs_beta_version = EMACS_BETA_VERSION; 2333 Vemacs_beta_version = Qnil;
2334 #endif
2312 2335
2313 DEFVAR_LISP ("xemacs-codename", &Vxemacs_codename /* 2336 DEFVAR_LISP ("xemacs-codename", &Vxemacs_codename /*
2314 Codename of this version of Emacs (a string). 2337 Codename of this version of Emacs (a string).
2315 */ ); 2338 */ );
2316 #ifndef XEMACS_CODENAME 2339 #ifndef XEMACS_CODENAME
2317 #define XEMACS_CODENAME Qnil 2340 #define XEMACS_CODENAME "Noname"
2318 #endif 2341 #endif
2319 Vxemacs_codename = Fpurecopy (build_string (XEMACS_CODENAME)); 2342 Vxemacs_codename = Fpurecopy (build_string (XEMACS_CODENAME));
2320 2343
2321 DEFVAR_BOOL ("noninteractive", &noninteractive1 /* 2344 DEFVAR_BOOL ("noninteractive", &noninteractive1 /*
2322 Non-nil means XEmacs is running without interactive terminal. 2345 Non-nil means XEmacs is running without interactive terminal.