xemacs-beta: src/emacs.c comparison

comparison src/emacs.c @ 70:131b0175ea99 r20-0b30

Import from CVS: tag r20-0b30

author	cvs
date	Mon, 13 Aug 2007 09:02:59 +0200
parents	05472e90ae02
children	c7528f8e288d

comparison

equal deleted inserted replaced

-:804d1389bcd6
+:131b0175ea99
 #endif
 #endif
 extern void memory_warnings (void *, void (*warnfun) (CONST char *));
-#ifndef SYSTEM_MALLOC
-extern void *(*__malloc_hook)(size_t);
-extern void *(*__realloc_hook)(void *, size_t);
-extern void (*__free_hook)(void *);
-#endif  /* not SYSTEM_MALLOC */
 /* Command line args from shell, as list of strings */
 Lisp_Object Vcommand_line_args;
 /* Set nonzero after XEmacs has started up the first time.
 Prevents reinitialization of the Lisp world and keymaps
 Lisp_Object Vsystem_type;
 /* Variable whose value is string giving configuration built for.  */
 Lisp_Object Vsystem_configuration;
-/* Version numbers and strings */
-Lisp_Object Vemacs_major_version;
-Lisp_Object Vemacs_minor_version;
 /* 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.  */
 EMACS_UNBLOCK_SIGNAL (fatal_error_code);
 /* If fatal error occurs in code below, avoid infinite recursion.  */
 if (! fatal_error_in_progress)
 {
-fatal_error_in_progress = dont_check_for_quit = 1;
+fatal_error_in_progress = 1;
 shut_down_emacs (sig, Qnil);
 stderr_out("\nLisp backtrace follows:\n\n");
 Fbacktrace(Qexternal_debugging_output, Qt);
-# if 0	/* This is evil, rarely useful, and causes grief in some cases. */
 /* Check for Sun-style stack printing via /proc */
 {
 CONST char *pstack = "/usr/proc/bin/pstack";
 if (access(pstack, X_OK) == 0)
 {
 "(A real debugger may provide better information)\n\n");
 sprintf(buf, "%s %d >&2", pstack, (int)getpid());
 system(buf);
 }
 }
-# endif
 }
 #ifdef VMS
 LIB$STOP (SS$_ABORT);
 #else
 /* Signal the same code; this time it will really be fatal. */
 #ifdef I18N4
 				/* #### - don't know why I18N4 on SunOS/JLE
 				   can't deal with this.  It's a potential
 				   bug that needs to be looked at. */
 # undef RUN_TIME_REMAP
+#endif
+#if defined (MULE) && defined (MSDOS) && defined (EMX)
+/* Setup all of files be input/output'ed with binary translation mdoe. */
+asm ("	.text");
+asm ("L_setbinmode:");
+asm ("	movl	$1, __fmode_bin");
+asm ("	ret");
+asm ("	.stabs	\"___CTOR_LIST__\", 23, 0, 0, L_setbinmode");
 #endif
 /* Test whether the next argument in ARGV matches SSTR or a prefix of
 LSTR (at least MINLEN characters).  If so, then if VALPTR is non-null
 (the argument is supposed to have a value) store in *VALPTR either
 {
 char stack_bottom_variable;
 int skip_args = 0;
 Lisp_Object load_me;
 int inhibit_window_system;
+noninteractive = 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 */
-noninteractive = 0;
-#ifdef NeXT
 /* 19-Jun-1995 -baw
 * NeXT secret magic, ripped from Emacs-for-NS by Carl Edman
 * <cedman@princeton.edu>.  Note that even Carl doesn't know what this
 * does; it was provided by NeXT, and it presumable makes NS's mallocator
 * work with dumping.  But malloc_jumpstart() and malloc_freezedry() in
 	if (open (term, O_RDWR, 2) < 0)
 	  fatal ("%s: %s", term, strerror (errno));
 	dup (0);
 	if (! isatty (0))
 	  fatal ("%s: not a tty", term);
 	stderr_out ("Using %s", ttyname (0));
 	inhibit_window_system = 1;	/* -t => -nw */
 }
 }
 inhibit_window_system = 1;
 /* Handle the -batch switch, which means don't do interactive display.  */
 if (argmatch (argv, argc, "-batch", "--batch", 5, NULL, &skip_args))
 noninteractive = 1;
 /* Partially handle the -version and -help switches: they imply -batch,
 but are not removed from the list. */
 if (argmatch (argv, argc, "-help", "--help",   3, NULL, &skip_args) ||
 argmatch (argv, argc, "-?",     0,         2, NULL, &skip_args) ||
 argmatch (argv, argc, "-flags", "--flags", 6, NULL, &skip_args))
 syms_of_bytecode ();
 syms_of_callint ();
 syms_of_callproc ();
 syms_of_casefiddle ();
 syms_of_casetab ();
+syms_of_chartab ();
 syms_of_cmdloop ();
 syms_of_cmds ();
 syms_of_console ();
 syms_of_data ();
 #ifdef DEBUG_XEMACS
 #ifdef HAVE_SCROLLBARS
 syms_of_scrollbar_ns ();
 #endif
 #endif /* HAVE_NEXTSTEP */
+#ifdef MULE
+syms_of_mule ();
+syms_of_mule_ccl ();
+syms_of_mule_charset ();
+syms_of_mule_coding ();
+#ifdef HAVE_WNN
+syms_of_mule_wnn ();
+#endif
+#ifdef HAVE_CANNA
+syms_of_mule_canna ();
+#endif /* HAVE_CANNA */
+#endif /* MULE */
 #ifdef SYMS_SYSTEM
 SYMS_SYSTEM;
 #endif
 #ifdef SYMS_MACHINE
 	 */
 structure_type_create ();
+structure_type_create_chartab ();
 structure_type_create_faces ();
 structure_type_create_rangetab ();
 /* Now initialize the image instantiator formats and associated symbols.
 Other than the first function below, the functions may
 	 LSTREAM_HAS_METHOD()
 	 */
 lstream_type_create ();
+#ifdef MULE
+lstream_type_create_mule_coding ();
+#endif
 lstream_type_create_print ();
 /* Now initialize most variables.
 	 These functions may do exactly the following:
 vars_of_gui ();
 #endif
 vars_of_indent ();
 vars_of_insdel ();
 vars_of_intl ();
+#ifdef HAVE_XIM
+#ifdef XIM_MOTIF
+vars_of_input_method_motif ();
+#else /* XIM_XLIB */
+vars_of_input_method_xlib ();
+#endif
+#endif /* HAVE_XIM */
 vars_of_keymap ();
 vars_of_lread ();
 vars_of_lstream ();
 vars_of_macros ();
 vars_of_md5 ();
 #if defined (HAVE_MENUBARS) || defined (HAVE_SCROLLBARS) || defined (HAVE_DIALOGS) || defined (HAVE_TOOLBARS)
 vars_of_gui_x ();
 #endif
 #endif
+#ifdef MULE
+vars_of_mule ();
+vars_of_mule_charset ();
+vars_of_mule_coding ();
+#ifdef HAVE_WNN
+vars_of_mule_wnn ();
+#endif
+#ifdef HAVE_CANNA
+vars_of_mule_canna ();
+#endif /* HAVE_CANNA */
+#endif /* MULE */
 #ifdef ENERGIZE
 vars_of_energize ();
 #endif
 #ifdef TOOLTALK
 complex_vars_of_extents ();
 /* Depends on hashtables and specifiers. */
 complex_vars_of_faces ();
+#ifdef MULE
+/* These two depend on hashtables and various variables declared
+	 earlier.  The second may also depend on the first. */
+complex_vars_of_mule_charset ();
+complex_vars_of_mule_coding ();
+#endif
 /* This calls allocate_glyph(), which creates specifiers
 	 and also relies on a variable (Vthe_nothing_vector) initialized
-	 above. */
+	 above.  It also calls make_ext_string(), which under Mule
+could require that the charsets be initialized. */
 complex_vars_of_glyphs ();
 /* This relies on the glyphs just created in the previous function,
 	 and calls Fadd_spec_to_specifier(), which relies on various
 	 variables initialized above. */
 /* Depends on hashtables. */
 #ifdef ENERGIZE
 complex_vars_of_energize ();
 #endif
+/* This calls Fcopy_category_table() under Mule, which calls who
+knows what. */
+complex_vars_of_chartab ();
 /* This calls set_string_char(), which (under Mule) depends on the
 	 charsets being initialized. */
 complex_vars_of_casetab ();
 {
 /* Stuff that needs to be reset at run time.  Order below should
 	 not matter. */
 reinit_alloc ();
 reinit_eval ();
+#ifdef MULE_REGEXP
+reinit_mule_category ();
+#endif
 }
 /* Now do further initialization/setup of stuff that is not needed by the
 syms_of_() routines.  This involves stuff that only is enabled in
 an interactive run (redisplay, user input, etc.) and stuff that is
 load_me = Qnil;
 if (!initialized)
 {
 /* Handle -l loadup-and-dump, args passed by Makefile. */
 if (argc > 2 + skip_args && !strcmp (argv[1 + skip_args], "-l"))
-	load_me = build_string (argv[2 + skip_args]);
+load_me = build_string (argv[2 + skip_args]);
 #ifdef CANNOT_DUMP
 /* Unless next switch is -nl, load "loadup.el" first thing.  */
 if (!(argc > 1 + skip_args && !strcmp (argv[1 + skip_args], "-nl")))
 	load_me = build_string ("loadup.el");
 #endif /* CANNOT_DUMP */
 int *options  = (int *) xmalloc (sizeof (int) * argc);
 int *priority = (int *) xmalloc (sizeof (int) * argc);
 int to = 1;
 int from;
 int i;
-int end_of_options_p = 0;
 /* Categorize all the options,
 and figure out which argv elts are option arguments.  */
 for (from = 1; from < argc; from++)
 {
 options[from] = -1;
 priority[from] = 0;
-/* Pseudo options "--" and "run-temacs" indicate end of options */
+if (argv[from][0] == '-')
-if (!strcmp (argv[from], "--") ||
-	  !strcmp (argv[from], "run-temacs"))
-	end_of_options_p = 1;
-if (!end_of_options_p && argv[from][0] == '-')
 	{
 	  int match, thislen;
 	  char *equals;
 	  /* Look for a match with a known old-fashioned option.  */
 much as long as your filesystem is local, and you don't end up with
 a dumped version in case you want to rerun it.  This function is most
 useful when used as part of the `make all-elc' command. --ben]
 This will \"restart\" emacs with the specified command-line arguments.
 */
 (int nargs, Lisp_Object *args))
 {
 int ac;
 Extbyte *wampum;
 int namesize;
 int total_len;
 #endif /* QUANTIFY */
 suppress_early_backtrace = 0;
 lim_data = 0; /* force reinitialization of this variable */
-/* Lisp_Object must fit in a word; check VALBITS and GCTYPEBITS */
+if (sizeof (Lisp_Object) != sizeof (void *))
-assert (sizeof (Lisp_Object) == sizeof (void *));
+abort (); /* Lisp_Object must fit in a word;
+		 check VALBITS and GCTYPEBITS */
 if (!initialized)
 {
 run_temacs_argc = 0;
 if (! SETJMP (run_temacs_catch))
-	main_1 (vol_argc, vol_argv, vol_envp);
+main_1 (vol_argc, vol_argv, vol_envp);
 /* run-emacs-from-temacs called */
 vol_argc = run_temacs_argc;
-vol_argv = run_temacs_argv;
+run_temacs_argc = 0;
+vol_argv = run_temacs_argv;
 #ifdef _SCO_DS
-/* This makes absolutely no sense to anyone involved.  There are
+/*
-	 several people using this stuff.  We've compared versions on
+This makes absolutely no sense to anyone involved.
-	 everything we can think of.  We can find no difference.
+There are several people using this stuff.  We've
-	 However, on both my systems environ is a plain old global
+compared versions on everything we can think of.  We
-	 variable initialized to zero.  _environ is the one that
+can find no difference.  However, on both my systems
-	 contains pointers to the actual environment.
+environ is a plain old global variable initialized to
+zero.  _environ is the one that contains pointers to
-	 Since we can't figure out the difference (and we're hours
+the actual environment.
-	 away from a release), this takes a very cowardly approach and
+Since we can't figure out the difference (and we're
-	 is bracketed with both a system specific preprocessor test
+hours away from a release), this takes a very cowardly
-	 and a runtime "do you have this problem" test
+approach and is bracketed with both a system specific
+preprocessor test and a runtime "do you have this
-	 06/20/96 robertl@dgii.com */
+problem" test
-{
+06/20/96 robertl@dgii.com
-	extern char *_environ;
+*/
-	if ((unsigned) environ == 0)
+{
-	  environ=_environ;
+extern char *_environ ;
-}
+if ((unsigned) environ == 0)
+environ=_environ;
+}
 #endif /* _SCO_DS */
 vol_envp = environ;
 }
 run_temacs_argc = -1;
 main_1 (vol_argc, vol_argv, vol_envp);
 }
 /* This flag is useful to define if you're under a debugger; this way, you
 can put a breakpoint of assert_failed() and debug multiple problems
 in one session without having to recompile. */
 /* #define ASSERTIONS_DONT_ABORT */
+#ifdef USE_ASSERTIONS
 /* This highly dubious kludge ... shut up Jamie, I'm tired of your slagging. */
 DOESNT_RETURN
 assert_failed (CONST char *file, int line, CONST char *expr)
 {
 #undef abort	/* avoid infinite #define loop... */
 #ifndef ASSERTIONS_DONT_ABORT
 abort ();
 #endif
 }
+#endif /* USE_ASSERTIONS */
 #ifdef QUANTIFY
 DEFUN ("quantify-start-recording-data",
 Fquantify_start_recording_data, 0, 0, 0, /*
 Start recording Quantify data.
 #endif
 DEFVAR_LISP ("system-configuration", &Vsystem_configuration /*
 Value is string indicating configuration XEmacs was built for.
 */ );
 Vsystem_configuration = Fpurecopy (build_string (EMACS_CONFIGURATION));
-/* emacs-major-version and emacs-minor-version work correctly in the */
-/* real XEmacs source code ... */
-DEFVAR_LISP ("emacs-major-version", &Vemacs_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
-*/ );
-Vemacs_major_version = make_int (19);
-DEFVAR_LISP ("emacs-minor-version", &Vemacs_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
-*/ );
-Vemacs_minor_version = make_int (16);
 DEFVAR_BOOL ("noninteractive", &noninteractive1 /*
 Non-nil means XEmacs is running without interactive terminal.
 */ );

Mercurial > hg > xemacs-beta

comparison src/emacs.c @ 70:131b0175ea99 r20-0b30