xemacs-beta: src/emacs.c comparison

comparison src/emacs.c @ 163:0132846995bd r20-3b8

Import from CVS: tag r20-3b8

author	cvs
date	Mon, 13 Aug 2007 09:43:35 +0200
parents	25f70ba0133c
children	5a88923fcbfe

comparison

equal deleted inserted replaced

-:4de2936b4e77
+:0132846995bd
 /* Variable whose value is symbol giving operating system type. */
 Lisp_Object Vsystem_type;
 /* Variable whose value is string giving configuration built for.  */
 Lisp_Object Vsystem_configuration;
 /* The name under which XEmacs was invoked, with any leading directory
 names discarded.  */
 Lisp_Object Vinvocation_name;
 /* The directory name from which XEmacs was invoked.  */
 /* Value of Lisp variable `noninteractive'.
 Normally same as C variable `noninteractive'
 but nothing terrible happens if user sets this one.  */
 int noninteractive1;
+/* Major & Minor version numbers are needed in temacs as of 20.3 */
+/* Version numbers and strings */
+int emacs_beta_version;
+int emacs_major_version;
+int emacs_minor_version;
+Lisp_Object Vxemacs_codename;
 /* Save argv and argc.  */
 char **initial_argv;
 int initial_argc;
 for (i = 0, next = argv_list; i < n; i++, next = XCDR (next))
 {
 CONST char *temp;
 CHECK_STRING (XCAR (next));
 GET_C_STRING_EXT_DATA_ALLOCA (XCAR (next), FORMAT_OS, temp);
 (*argv) [i] = xstrdup (temp);
 }
 (*argv) [n] = 0;
 *argc = i;
 {
 return 0;
 }
 }
+/* Make stack traces always identify version + configuration */
+/* C makes this bizarre circumlocution necessary. */
+#define PASTE_1(x,y) PASTE_2(x,y)
+#define PASTE_2(x,y) x##y
+#define main_1 PASTE_1(main_, CANONICAL_VERSION)
 static DOESNT_RETURN
 main_1 (int argc, char **argv, char **envp)
 {
 char stack_bottom_variable;
 int skip_args = 0;
 #ifdef NeXT
 extern int malloc_cookie;
 #endif
 #ifndef SYSTEM_MALLOC
 /* Make sure that any libraries we link against haven't installed a
 hook for a gmalloc of a potentially incompatible version. */
 __malloc_hook = NULL;
 __realloc_hook = NULL;
 __free_hook = NULL;
 #endif /* not SYSTEM_MALLOC */
 	if (open (term, O_RDWR, 2) < 0)
 	  fatal ("%s: %s", term, strerror (errno));
 	dup (0);
 	if (! isatty (0))
 	  fatal ("%s: not a tty", term);
 #if 0
 	stderr_out ("Using %s", ttyname (0));
 #endif
 	stderr_out ("Using %s", term);
 	inhibit_window_system = 1;	/* -t => -nw */
 noninteractive = 1, skip_args--;
 if (argmatch (argv, argc, "-version", "--version", 3, NULL, &skip_args) ||
 argmatch (argv, argc, "-V",    0,              2, NULL, &skip_args))
 noninteractive = 1, skip_args--;
 /* Now, figure out which type of console is our first console. */
 display_arg = 0;
 if (noninteractive)
 if (!inhibit_window_system && !noninteractive)
 {
 #ifdef HAVE_X_WINDOWS
 char *dpy = 0;
 int count_before = skip_args;
 if (argmatch (argv, argc, "-d", "--display", 3, &dpy, &skip_args) ||
 	  argmatch (argv, argc, "-display", 0,     3, &dpy, &skip_args))
 	{
 	  display_arg = 1;
 	  display_use = "x";
 /* If there is a non-empty environment var DISPLAY, set
 `display_use', but not `display_arg', which is only to be set
 if the display was specified on the command line. */
 if ((dpy = getenv ("DISPLAY")) && dpy[0])
 	display_use = "x";
 #endif /* HAVE_X_WINDOWS */
 }
 #endif /* HAVE_WINDOW_SYSTEM */
 noninteractive1 = noninteractive;
 #ifdef SYMS_MACHINE
 SYMS_MACHINE;
 #endif
 #ifdef EMACS_BTL
 syms_of_btl ();
 #endif
 #ifdef ENERGIZE
 syms_of_energize ();
 #endif
 /* Calls Fmake_hashtable(). */
 complex_vars_of_event_stream ();
 /* Calls make_lisp_hashtable(). */
 complex_vars_of_extents ();
 /* Depends on hashtables and specifiers. */
 complex_vars_of_faces ();
 #ifdef MULE
 /* These two depend on hashtables and various variables declared
 { "-r", "--reverse-video", 5, 0 },
 { "-rv", 0, 5, 0 },
 { "-reverse", 0, 5, 0 },
 { "-hb", "--horizontal-scroll-bars", 5, 0 },
 { "-vb", "--vertical-scroll-bars", 5, 0 },
 /* These have the same priority as ordinary file name args,
 so they are not reordered with respect to those.  */
 { "-L", "--directory", 0, 1 },
 { "-directory", 0, 0, 1 },
 { "-l", "--load", 0, 1 },
 	    }
 	  /* Skip option arguments--they are tied to the options.  */
 	  if (options[from] > 0)
 	    from += options[from];
 	}
 if (best < 0)
 	abort ();
 /* Copy the highest priority remaining option, with its args, to NEW.  */
 new[to++] = argv[best];
 if (run_temacs_argc < 0)
 error ("I've lost my temacs-hood.");
 /* Need to convert the orig_invoc_name and all of the arguments
 to external format. */
 GET_STRING_EXT_DATA_ALLOCA (orig_invoc_name, FORMAT_OS, wampum,
 			      namesize);
 namesize++;
 for (ac = 0, total_len = namesize; ac < nargs; ac++)
 LONGJMP (run_temacs_catch, 1);
 return Qnil; /* not reached; warning suppression */
 }
 /* ARGSUSED */
-DOESNT_RETURN
+int
 main (int argc, char **argv, char **envp)
 {
 int     volatile vol_argc = argc;
 char ** volatile vol_argv = argv;
 char ** volatile vol_envp = envp;
 	 several people using this stuff.  We've compared versions on
 	 everything we can think of.  We can find no difference.
 	 However, on both my systems environ is a plain old global
 	 variable initialized to zero.  _environ is the one that
 	 contains pointers to the actual environment.
 	 Since we can't figure out the difference (and we're hours
 	 away from a release), this takes a very cowardly approach and
 	 is bracketed with both a system specific preprocessor test
 	 and a runtime "do you have this problem" test
 	 06/20/96 robertl@dgii.com */
 {
 	extern char *_environ;
 	if ((unsigned) environ == 0)
 	  environ=_environ;
 vol_envp = environ;
 }
 run_temacs_argc = -1;
 main_1 (vol_argc, vol_argv, vol_envp);
+return 0; /* unreached */
 }
 DEFUN ("kill-emacs", Fkill_emacs, 0, 1, "P", /*
 Exit the XEmacs job and kill it.  Ask for confirmation, without argument.
 DEFVAR_LISP ("system-configuration", &Vsystem_configuration /*
 Value is string indicating configuration XEmacs was built for.
 */ );
 Vsystem_configuration = Fpurecopy (build_string (EMACS_CONFIGURATION));
+DEFVAR_INT ("emacs-beta-version", &emacs_beta_version /*
+Beta number of this version of Emacs, as an integer.
+The value is nil if this is an officially released version of XEmacs.
+Warning: this variable does not exist in FSF Emacs or in XEmacs versions
+earlier than 20.3.
+*/ );
+#ifndef EMACS_BETA_VERSION
+#define EMACS_BETA_VERSION Qnil
+#endif
+emacs_beta_version = EMACS_BETA_VERSION;
+DEFVAR_LISP ("xemacs-codename", &Vxemacs_codename /*
+Codename of this version of Emacs (a string).
+*/ );
+#ifndef XEMACS_CODENAME
+#define XEMACS_CODENAME Qnil
+#endif
+Vxemacs_codename = Fpurecopy (build_string (XEMACS_CODENAME));
 DEFVAR_BOOL ("noninteractive", &noninteractive1 /*
 Non-nil means XEmacs is running without interactive terminal.
 */ );
 DEFVAR_INT ("emacs-priority", &emacs_priority /*
 it to change priority.  (XEmacs sets its uid back to the real uid.)
 Currently, you need to define SET_EMACS_PRIORITY in `config.h'
 before you compile XEmacs, to enable the code for this feature.
 */ );
 emacs_priority = 0;
-}
+DEFVAR_INT ("emacs-major-version", &emacs_major_version /*
+Major version number of this version of Emacs, as an integer.
+Warning, this variable did not exist in Emacs versions earlier than:
+FSF Emacs:   19.23
+XEmacs:      19.10
+This variable was not available to temacs prior to:
+XEmacs:      20.3
+*/ );
+emacs_major_version = EMACS_MAJOR_VERSION;
+DEFVAR_INT ("emacs-minor-version", &emacs_minor_version /*
+Minor version number of this version of Emacs, as an integer.
+Warning, this variable did not exist in Emacs versions earlier than:
+FSF Emacs:   19.23
+XEmacs:      19.10
+This variable was not available to temacs prior to:
+XEMacs:      20.3
+*/ );
+emacs_minor_version = EMACS_MINOR_VERSION;
+}

Mercurial > hg > xemacs-beta

comparison src/emacs.c @ 163:0132846995bd r20-3b8