/* Fully extensible Emacs, running on Unix, intended for GNU.
- Copyright (C) 1985,86,87,93,94,95,97,1998 Free Software Foundation, Inc.
+ Copyright (C) 1985,86,87,93,94,95,97,98,1999 Free Software Foundation, Inc.
This file is part of GNU Emacs.
Boston, MA 02111-1307, USA. */
+#include <config.h>
#include <signal.h>
#include <errno.h>
-
-#include <config.h>
#include <stdio.h>
#include <sys/types.h>
#include <ssdef.h>
#endif
+#ifdef HAVE_UNISTD_H
+#include <unistd.h>
+#endif
+
#ifdef BSD_SYSTEM
#include <sys/ioctl.h>
#endif
#include "blockinput.h"
#include "syssignal.h"
#include "process.h"
+#include "termhooks.h"
#include "keyboard.h"
+#ifdef HAVE_SETLOCALE
+#include <locale.h>
+#endif
+
#ifdef HAVE_SETRLIMIT
#include <sys/time.h>
#include <sys/resource.h>
extern void *malloc_get_state ();
/* From glibc, a routine that overwrites the malloc internal state. */
extern void malloc_set_state ();
+/* Non-zero if the MALLOC_CHECK_ enviroment variable was set while
+ dumping. Used to work around a bug in glibc's malloc. */
+int malloc_using_checking;
#endif
/* Variable whose value is symbol giving operating system type. */
Lisp_Object Qfile_name_handler_alist;
+/* Current and previous system locales for messages and time. */
+Lisp_Object Vmessages_locale;
+Lisp_Object Vprevious_messages_locale;
+Lisp_Object Vtime_locale;
+Lisp_Object Vprevious_time_locale;
+
/* If non-zero, emacs should not attempt to use an window-specific code,
but instead should use the virtual terminal under which it was started */
int inhibit_window_system;
int fatal_error_in_progress;
#ifdef SIGUSR1
-int SIGUSR1_in_progress=0;
SIGTYPE
handle_USR1_signal (sig)
int sig;
{
- if (! SIGUSR1_in_progress)
- {
- SIGUSR1_in_progress = 1;
-
- if (!NILP (Vrun_hooks) && !noninteractive)
- call1 (Vrun_hooks, intern ("signal-USR1-hook"));
-
- SIGUSR1_in_progress = 0;
- }
+ struct input_event buf;
+
+ buf.kind = user_signal;
+ buf.code = 0;
+ buf.frame_or_window = selected_frame;
+ buf.modifiers = 0;
+ buf.timestamp = 0;
+
+ kbd_buffer_store_event (&buf);
}
+#endif /* SIGUSR1 */
#ifdef SIGUSR2
-int SIGUSR2_in_progress=0;
SIGTYPE
handle_USR2_signal (sig)
int sig;
{
- if (! SIGUSR2_in_progress)
- {
- SIGUSR2_in_progress = 1;
-
- if (!NILP (Vrun_hooks) && !noninteractive)
- call1 (Vrun_hooks, intern ("signal-USR2-hook"));
-
- SIGUSR2_in_progress = 0;
- }
+ struct input_event buf;
+
+ buf.kind = user_signal;
+ buf.code = 1;
+ buf.frame_or_window = selected_frame;
+ buf.modifiers = 0;
+ buf.timestamp = 0;
+
+ kbd_buffer_store_event (&buf);
}
-#endif
-#endif
+#endif /* SIGUSR2 */
/* Handle bus errors, illegal instruction, etc. */
SIGTYPE
}
}
+#ifdef DOUG_LEA_MALLOC
+
+/* malloc can be invoked even before main (e.g. by the dynamic
+ linker), so the dumped malloc state must be restored as early as
+ possible using this special hook. */
+
+static void
+malloc_initialize_hook ()
+{
+ extern char **environ;
+
+ if (initialized)
+ {
+ if (!malloc_using_checking)
+ /* Work around a bug in glibc's malloc. MALLOC_CHECK_ must be
+ ignored if the heap to be restored was constructed without
+ malloc checking. Can't use unsetenv, since that calls malloc. */
+ {
+ char **p;
+
+ for (p = environ; *p; p++)
+ if (strncmp (*p, "MALLOC_CHECK_=", 14) == 0)
+ {
+ do
+ *p = p[1];
+ while (*++p);
+ break;
+ }
+ }
+
+ malloc_set_state (malloc_state_ptr);
+ free (malloc_state_ptr);
+ }
+ else
+ malloc_using_checking = getenv ("MALLOC_CHECK_") != NULL;
+}
+
+void (*__malloc_initialize_hook) () = malloc_initialize_hook;
+
+#endif /* DOUG_LEA_MALLOC */
+
/* ARGSUSED */
int
main (argc, argv, envp)
char **envp;
{
char stack_bottom_variable;
+ int do_initial_setlocale;
int skip_args = 0;
extern int errno;
extern int sys_nerr;
#ifdef HAVE_SETRLIMIT
struct rlimit rlim;
#endif
+ int no_loadup = 0;
#ifdef LINUX_SBRK_BUG
__sbrk (1);
#endif
-#ifdef DOUG_LEA_MALLOC
- if (initialized)
- {
- extern void r_alloc_reinit ();
- malloc_set_state (malloc_state_ptr);
- free (malloc_state_ptr);
- r_alloc_reinit ();
- }
-#endif
-
#ifdef RUN_TIME_REMAP
if (initialized)
run_time_remap (argv[0]);
#endif
sort_args (argc, argv);
+ argc = 0;
+ while (argv[argc]) argc++;
- if (argmatch (argv, argc, "-version", "--version", 3, NULL, &skip_args))
+ if (argmatch (argv, argc, "-version", "--version", 3, NULL, &skip_args)
+ /* We don't know the version number unless this is a dumped Emacs.
+ So ignore --version otherwise. */
+ && initialized)
{
Lisp_Object tem;
tem = Fsymbol_value (intern ("emacs-version"));
else
{
printf ("GNU Emacs %s\n", XSTRING (tem)->data);
- printf ("Copyright (C) 1997 Free Software Foundation, Inc.\n");
+ printf ("Copyright (C) 1999 Free Software Foundation, Inc.\n");
printf ("GNU Emacs comes with ABSOLUTELY NO WARRANTY.\n");
printf ("You may redistribute copies of Emacs\n");
printf ("under the terms of the GNU General Public License.\n");
printf ("For more information about these matters, ");
- printf ("see the files named COPYING.\n");
+ printf ("see the file named COPYING.\n");
exit (0);
}
}
clearerr (stdin);
#ifndef SYSTEM_MALLOC
- if (! initialized)
- {
- /* Arrange to get warning messages as memory fills up. */
- memory_warnings (0, malloc_warning);
+ /* Arrange to get warning messages as memory fills up. */
+ memory_warnings (0, malloc_warning);
- /* Arrange to disable interrupt input while malloc and friends are
- running. */
- uninterrupt_malloc ();
- }
+ /* Call malloc at least once, to run the initial __malloc_hook.
+ Also call realloc and free for consistency. */
+ free (realloc (malloc (4), 4));
+
+ /* Arrange to disable interrupt input inside malloc etc. */
+ uninterrupt_malloc ();
#endif /* not SYSTEM_MALLOC */
#ifdef MSDOS
setuid (getuid ());
#endif /* SET_EMACS_PRIORITY */
+ /* Skip initial setlocale if LC_ALL is "C", as it's not needed in that case.
+ The build procedure uses this while dumping, to ensure that the
+ dumped Emacs does not have its system locale tables initialized,
+ as that might cause screwups when the dumped Emacs starts up. */
+ {
+ char *lc_all = getenv ("LC_ALL");
+ do_initial_setlocale = ! lc_all || strcmp (lc_all, "C");
+ }
+
+ /* Set locale now, so that initial error messages are localized properly.
+ fixup_locale must wait until later, since it builds strings. */
+ if (do_initial_setlocale)
+ setlocale (LC_ALL, "");
+
#ifdef EXTRA_INITIALIZE
EXTRA_INITIALIZE;
#endif
inhibit_window_system = 0;
/* Handle the -t switch, which specifies filename to use as terminal */
- {
- char *term;
- if (argmatch (argv, argc, "-t", "--terminal", 4, &term, &skip_args))
- {
- int result;
- close (0);
- close (1);
- result = open (term, O_RDWR, 2 );
- if (result < 0)
- {
- char *errstring = strerror (errno);
- fprintf (stderr, "emacs: %s: %s\n", term, errstring);
- exit (1);
- }
- dup (0);
- if (! isatty (0))
- {
- fprintf (stderr, "emacs: %s: not a tty\n", term);
- exit (1);
- }
- fprintf (stderr, "Using %s\n", term);
+ while (1)
+ {
+ char *term;
+ if (argmatch (argv, argc, "-t", "--terminal", 4, &term, &skip_args))
+ {
+ int result;
+ emacs_close (0);
+ emacs_close (1);
+ result = emacs_open (term, O_RDWR, 0);
+ if (result < 0)
+ {
+ char *errstring = strerror (errno);
+ fprintf (stderr, "emacs: %s: %s\n", term, errstring);
+ exit (1);
+ }
+ dup (0);
+ if (! isatty (0))
+ {
+ fprintf (stderr, "emacs: %s: not a tty\n", term);
+ exit (1);
+ }
+ fprintf (stderr, "Using %s\n", term);
#ifdef HAVE_WINDOW_SYSTEM
- inhibit_window_system = 1; /* -t => -nw */
+ inhibit_window_system = 1; /* -t => -nw */
#endif
- }
- }
+ }
+ else
+ break;
+ }
+
if (argmatch (argv, argc, "-nw", "--no-windows", 6, NULL, &skip_args))
inhibit_window_system = 1;
if (argmatch (argv, argc, "-help", "--help", 3, NULL, &skip_args))
{
printf ("\
-Usage: %s [-t term] [--terminal term] [-nw] [--no-windows] [--batch]\n\
+Usage: %s [--batch] [-t term] [--terminal term]\n\
+ [-d display] [--display display] [-nw] [--no-windows]\n\
[-q] [--no-init-file] [-u user] [--user user] [--debug-init]\n\
[--unibyte] [--multibyte] [--version] [--no-site-file]\n\
- [-f func] [--funcall func] [-l file] [--load file] [--insert file]\n\
+ [-f func] [--funcall func] [-l file] [--load file] [--eval expr]\n\
+ [--execute expr] [--visit file] [--file file] [--insert file]\n\
[+linenum] file-to-visit [--kill]\n\
Report bugs to bug-gnu-emacs@gnu.org. First, please see\n\
the Bugs section of the Emacs manual or the file BUGS.\n", argv[0]);
exit (0);
}
-#ifdef HAVE_X_WINDOWS
- /* Stupid kludge to catch command-line display spec. We can't
- handle this argument entirely in window system dependent code
- because we don't even know which window system dependent code
- to run until we've recognized this argument. */
- {
- char *displayname = 0;
- int i;
- int count_before = skip_args;
-
- if (argmatch (argv, argc, "-d", "--display", 3, &displayname, &skip_args))
- display_arg = 1;
- else if (argmatch (argv, argc, "-display", 0, 3, &displayname, &skip_args))
- display_arg = 1;
-
- /* If we have the form --display=NAME,
- convert it into -d name.
- This requires inserting a new element into argv. */
- if (displayname != 0 && skip_args - count_before == 1)
- {
- char **new = (char **) xmalloc (sizeof (char *) * (argc + 2));
- int j;
-
- for (j = 0; j < count_before + 1; j++)
- new[j] = argv[j];
- new[count_before + 1] = "-d";
- new[count_before + 2] = displayname;
- for (j = count_before + 2; j <argc; j++)
- new[j + 1] = argv[j];
- argv = new;
- argc++;
- }
- /* Change --display to -d, when its arg is separate. */
- else if (displayname != 0 && skip_args > count_before
- && argv[count_before + 1][1] == '-')
- argv[count_before + 1] = "-d";
-
- /* Don't actually discard this arg. */
- skip_args = count_before;
- }
-#endif
-
if (! noninteractive)
{
#ifdef BSD_PGRPS
init_casetab_once ();
init_buffer_once (); /* Create buffer table and some buffers */
init_minibuf_once (); /* Create list of minibuffers */
- /* Must precede init_window_once */
+ /* Must precede init_window_once */
+
+ /* Call syms_of_xfaces before init_window_once because that
+ function creates Vterminal_frame. Termcap frames now use
+ faces, and the face implementation uses some symbols as
+ face names. */
+#ifndef HAVE_NTGUI
+ syms_of_xfaces ();
+#endif
+
init_window_once (); /* Init the window system */
+ init_fileio_once (); /* Must precede any path manipulation. */
}
init_alloc ();
+
+ if (do_initial_setlocale)
+ {
+ fixup_locale ();
+ Vmessages_locale = Vprevious_messages_locale;
+ Vtime_locale = Vprevious_time_locale;
+ }
+
init_eval ();
+ init_coding ();
init_data ();
+#ifdef CLASH_DETECTION
+ init_filelock ();;
+#endif
running_asynch_code = 0;
/* Handle --unibyte and the EMACS_UNIBYTE envvar,
buffers and strings. We need to handle this before calling
init_lread, init_editfns and other places that generate Lisp strings
from text in the environment. */
+ /* Actually this shouldn't be needed as of 20.4 in a generally
+ unibyte environment. As handa says, environment values
+ aren't now decoded; also existing buffers are now made
+ unibyte during startup if .emacs sets unibyte. Tested with
+ 8-bit data in environment variables and /etc/passwd, setting
+ unibyte and Latin-1 in .emacs. -- Dave Love */
if (argmatch (argv, argc, "-unibyte", "--unibyte", 4, NULL, &skip_args)
|| argmatch (argv, argc, "-no-multibyte", "--no-multibyte", 4, NULL, &skip_args)
|| (getenv ("EMACS_UNIBYTE") && !inhibit_unibyte))
symbol = intern ("default-enable-multibyte-characters");
Fset (symbol, Qnil);
- /* Erase pre-dump messages in *Messages* now so no abort. */
- old_log_max = Vmessage_log_max;
- XSETFASTINT (Vmessage_log_max, 0);
- message_dolog ("", 0, 1, 0);
- Vmessage_log_max = old_log_max;
+ if (initialized)
+ {
+ /* Erase pre-dump messages in *Messages* now so no abort. */
+ old_log_max = Vmessage_log_max;
+ XSETFASTINT (Vmessage_log_max, 0);
+ message_dolog ("", 0, 1, 0);
+ Vmessage_log_max = old_log_max;
+ }
for (tail = Vbuffer_alist; CONSP (tail);
- tail = XCONS (tail)->cdr)
+ tail = XCDR (tail))
{
Lisp_Object buffer;
- buffer = Fcdr (XCONS (tail)->car);
+ buffer = Fcdr (XCAR (tail));
/* Verify that all buffers are empty now, as they
ought to be. */
if (BUF_Z (XBUFFER (buffer)) > BUF_BEG (XBUFFER (buffer)))
}
}
+ no_loadup
+ = !argmatch (argv, argc, "-nl", "--no-loadup", 6, NULL, &skip_args);
+
+
+#ifdef HAVE_X_WINDOWS
+ /* Stupid kludge to catch command-line display spec. We can't
+ handle this argument entirely in window system dependent code
+ because we don't even know which window system dependent code
+ to run until we've recognized this argument. */
+ {
+ char *displayname = 0;
+ int count_before = skip_args;
+
+ /* Skip any number of -d options, but only use the last one. */
+ while (1)
+ {
+ int count_before_this = skip_args;
+
+ if (argmatch (argv, argc, "-d", "--display", 3, &displayname, &skip_args))
+ display_arg = 1;
+ else if (argmatch (argv, argc, "-display", 0, 3, &displayname, &skip_args))
+ display_arg = 1;
+ else
+ break;
+
+ count_before = count_before_this;
+ }
+
+ /* If we have the form --display=NAME,
+ convert it into -d name.
+ This requires inserting a new element into argv. */
+ if (displayname != 0 && skip_args - count_before == 1)
+ {
+ char **new = (char **) xmalloc (sizeof (char *) * (argc + 2));
+ int j;
+
+ for (j = 0; j < count_before + 1; j++)
+ new[j] = argv[j];
+ new[count_before + 1] = "-d";
+ new[count_before + 2] = displayname;
+ for (j = count_before + 2; j <argc; j++)
+ new[j + 1] = argv[j];
+ argv = new;
+ argc++;
+ }
+ /* Change --display to -d, when its arg is separate. */
+ else if (displayname != 0 && skip_args > count_before
+ && argv[count_before + 1][1] == '-')
+ argv[count_before + 1] = "-d";
+
+ /* Don't actually discard this arg. */
+ skip_args = count_before;
+ }
+#endif
+
+ /* argmatch must not be used after here,
+ except when bulding temacs
+ because the -d argument has not been skipped in skip_args. */
+
#ifdef MSDOS
/* Call early 'cause init_environment needs it. */
init_dosfns ();
#ifdef WINDOWSNT
/* Initialize environment from registry settings. */
- init_environment ();
+ init_environment (argv);
init_ntproc (); /* must precede init_editfns */
#endif
init_callproc (); /* Must follow init_cmdargs but not init_sys_modes. */
init_lread ();
- if (!noninteractive)
- {
-#ifdef VMS
- init_vms_input ();/* init_display calls get_frame_size, that needs this */
-#endif /* VMS */
- init_display (); /* Determine terminal type. init_sys_modes uses results */
- }
- init_keyboard (); /* This too must precede init_sys_modes */
-#ifdef VMS
- init_vmsproc (); /* And this too. */
-#endif /* VMS */
- init_sys_modes (); /* Init system terminal modes (RAW or CBREAK, etc.) */
- init_xdisp ();
- init_macros ();
- init_editfns ();
-#ifdef LISP_FLOAT_TYPE
- init_floatfns ();
-#endif
-#ifdef VMS
- init_vmsfns ();
-#endif /* VMS */
- init_process ();
-
-/* Intern the names of all standard functions and variables; define standard keys */
+ /* Intern the names of all standard functions and variables;
+ define standard keys. */
if (!initialized)
{
syms_of_syntax ();
syms_of_term ();
syms_of_undo ();
+#ifdef HAVE_SOUND
+ syms_of_sound ();
+#endif
/* Only defined if Emacs is compiled with USE_TEXT_PROPERTIES */
syms_of_textprop ();
#endif /* HAVE_X_WINDOWS */
#ifndef HAVE_NTGUI
- syms_of_xfaces ();
syms_of_xmenu ();
#endif
syms_of_w32faces ();
syms_of_w32select ();
syms_of_w32menu ();
+ syms_of_fontset ();
#endif /* HAVE_NTGUI */
#ifdef SYMS_SYSTEM
keys_of_frame ();
}
+ if (!noninteractive)
+ {
+#ifdef VMS
+ init_vms_input ();/* init_display calls get_frame_size, that needs this */
+#endif /* VMS */
+ init_display (); /* Determine terminal type. init_sys_modes uses results */
+ }
+ init_keyboard (); /* This too must precede init_sys_modes */
+#ifdef VMS
+ init_vmsproc (); /* And this too. */
+#endif /* VMS */
+ init_sys_modes (); /* Init system terminal modes (RAW or CBREAK, etc.) */
+#ifdef HAVE_X_WINDOWS
+ init_xfns ();
+#endif /* HAVE_X_WINDOWS */
+ init_fns ();
+ init_xdisp ();
+ init_macros ();
+ init_editfns ();
+#ifdef LISP_FLOAT_TYPE
+ init_floatfns ();
+#endif
+#ifdef VMS
+ init_vmsfns ();
+#endif /* VMS */
+ init_process ();
+#ifdef HAVE_SOUND
+ init_sound ();
+#endif
+
if (!initialized)
{
char *file;
- /* Handle -l loadup-and-dump, args passed by Makefile. */
+ /* Handle -l loadup, args passed by Makefile. */
if (argmatch (argv, argc, "-l", "--load", 3, &file, &skip_args))
Vtop_level = Fcons (intern ("load"),
Fcons (build_string (file), Qnil));
#ifdef CANNOT_DUMP
/* Unless next switch is -nl, load "loadup.el" first thing. */
- if (!argmatch (argv, argc, "-nl", "--no-loadup", 6, NULL, &skip_args))
+ if (! no_loadup)
Vtop_level = Fcons (intern ("load"),
Fcons (build_string ("loadup.el"), Qnil));
#endif /* CANNOT_DUMP */
/* Gerd Moellmann <gerd@acm.org> says this makes profiling work on
FreeBSD. It might work on some other systems too.
Give it a try and tell me if it works on your system. */
-#ifdef __FreeBSD__
+#if defined (__FreeBSD__) || defined (__linux)
#ifdef PROFILING
if (initialized)
{
extern void _mcleanup ();
extern char etext;
- extern Lisp_Object Fredraw_frame ();
+ extern void safe_bcopy ();
+ extern void dump_opcode_frequencies ();
+
atexit (_mcleanup);
- /* This uses Fredraw_frame because that function
- comes first in the Emacs executable.
- It might be better to use something that gives
- the start of the text segment, but start_of_text
- is not defined on all systems now. */
- monstartup (Fredraw_frame, &etext);
+ // atexit (dump_opcode_frequencies);
+ /* This uses safe_bcopy because that function comes first in the
+ Emacs executable. It might be better to use something that
+ gives the start of the text segment, but start_of_text is not
+ defined on all systems now. */
+ monstartup (safe_bcopy, &etext);
}
else
moncontrol (0);
struct standard_args standard_args[] =
{
- { "-version", "--version", 110, 0 },
- { "-help", "--help", 110, 0 },
- { "-nl", "--no-shared-memory", 100, 0 },
+ { "-version", "--version", 150, 0 },
+#ifdef HAVE_SHM
+ { "-nl", "--no-shared-memory", 140, 0 },
+#endif
#ifdef VMS
- { "-map", "--map-data", 100, 0 },
-#endif
- { "-t", "--terminal", 90, 1 },
- { "-d", "--display", 80, 1 },
- { "-display", 0, 80, 1 },
- { "-nw", "--no-windows", 70, 0 },
- { "-no-unibyte", "--no-unibyte", 66, 0 },
- { "-multibyte", "--multibyte", 66, 0 },
- { "-unibyte", "--unibyte", 65, 0 },
- { "-no-multibyte", "--no-multibyte", 65, 0 },
- { "-batch", "--batch", 60, 0 },
+ { "-map", "--map-data", 130, 0 },
+#endif
+ { "-t", "--terminal", 120, 1 },
+ { "-nw", "--no-windows", 110, 0 },
+ { "-batch", "--batch", 100, 0 },
+ { "-help", "--help", 90, 0 },
+ { "-no-unibyte", "--no-unibyte", 83, 0 },
+ { "-multibyte", "--multibyte", 82, 0 },
+ { "-unibyte", "--unibyte", 81, 0 },
+ { "-no-multibyte", "--no-multibyte", 80, 0 },
+#ifdef CANNOT_DUMP
+ { "-nl", "--no-loadup", 70, 0 },
+#endif
+ /* -d must come last before the options handled in startup.el. */
+ { "-d", "--display", 60, 1 },
+ { "-display", 0, 60, 1 },
+ /* Now for the options handled in startup.el. */
{ "-q", "--no-init-file", 50, 0 },
{ "-no-init-file", 0, 50, 0 },
{ "-no-site-file", "--no-site-file", 40, 0 },
{ "-f", "--funcall", 0, 1 },
{ "-funcall", 0, 0, 1 },
{ "-eval", "--eval", 0, 1 },
+ { "-execute", "--execute", 0, 1 },
{ "-find-file", "--find-file", 0, 1 },
{ "-visit", "--visit", 0, 1 },
+ { "-file", "--file", 0, 1 },
{ "-insert", "--insert", 0, 1 },
/* This should be processed after ordinary file name args and the like. */
{ "-kill", "--kill", -10, 0 },
/* Reorder the elements of ARGV (assumed to have ARGC elements)
so that the highest priority ones come first.
Do not change the order of elements of equal priority.
- If an option takes an argument, keep it and its argument together. */
+ If an option takes an argument, keep it and its argument together.
+
+ If an option that takes no argument appears more
+ than once, eliminate all but one copy of it. */
static void
sort_args (argc, argv)
int *options = (int *) xmalloc (sizeof (int) * argc);
int *priority = (int *) xmalloc (sizeof (int) * argc);
int to = 1;
+ int incoming_used = 1;
int from;
int i;
- int end_of_options = argc;
/* Categorize all the options,
and figure out which argv elts are option arguments. */
/* Copy the arguments, in order of decreasing priority, to NEW. */
new[0] = argv[0];
- while (to < argc)
+ while (incoming_used < argc)
{
int best = -1;
int best_priority = -9999;
if (best < 0)
abort ();
- /* Copy the highest priority remaining option, with its args, to NEW. */
- new[to++] = argv[best];
- for (i = 0; i < options[best]; i++)
- new[to++] = argv[best + i + 1];
+ /* Copy the highest priority remaining option, with its args, to NEW.
+ Unless it is a duplicate of the previous one. */
+ if (! (options[best] == 0
+ && ! strcmp (new[to - 1], argv[best])))
+ {
+ new[to++] = argv[best];
+ for (i = 0; i < options[best]; i++)
+ new[to++] = argv[best + i + 1];
+ }
+
+ incoming_used += 1 + (options[best] > 0 ? options[best] : 0);
/* Clear out this option in ARGV. */
argv[best] = 0;
argv[best + i + 1] = 0;
}
+ /* If duplicate options were deleted, fill up extra space with null ptrs. */
+ while (to < argc)
+ new[to++] = 0;
+
bcopy (new, argv, sizeof (char *) * argc);
free (options);
(arg)
Lisp_Object arg;
{
- Lisp_Object hook, hook1;
- int i;
struct gcpro gcpro1;
GCPRO1 (arg);
term_ntproc ();
#endif
+ check_glyph_memory ();
+ check_message_stack ();
+
#ifdef MSDOS
dos_cleanup ();
#endif
#endif /* not CANNOT_DUMP */
\f
+#if HAVE_SETLOCALE
+/* Recover from setlocale (LC_ALL, ""). */
+void
+fixup_locale ()
+{
+ char *l;
+
+ /* The Emacs Lisp reader needs LC_NUMERIC to be "C",
+ so that numbers are read and printed properly for Emacs Lisp. */
+ setlocale (LC_NUMERIC, "C");
+
+#ifdef LC_MESSAGES
+ l = setlocale (LC_MESSAGES, (char *) 0);
+ Vprevious_messages_locale = l ? build_string (l) : Qnil;
+#endif
+ l = setlocale (LC_TIME, (char *) 0);
+ Vprevious_time_locale = l ? build_string (l) : Qnil;
+}
+
+static void
+synchronize_locale (category, plocale, desired_locale)
+ int category;
+ Lisp_Object *plocale;
+ Lisp_Object desired_locale;
+{
+ if (STRINGP (desired_locale)
+ && (NILP (*plocale) || NILP (Fstring_equal (*plocale, desired_locale)))
+ && setlocale (category, XSTRING (desired_locale)->data))
+ *plocale = desired_locale;
+}
+
+/* Set system time locale to match Vtime_locale, if possible. */
+void
+synchronize_time_locale ()
+{
+ synchronize_locale (LC_TIME, &Vprevious_time_locale, Vtime_locale);
+}
+
+/* Set system messages locale to match Vmessages_locale, if possible. */
+void
+synchronize_messages_locale ()
+{
+#ifdef LC_MESSAGES
+ synchronize_locale (LC_MESSAGES, &Vprevious_messages_locale,
+ Vmessages_locale);
+#endif
+}
+#endif /* HAVE_SETLOCALE */
+\f
#ifndef SEPCHAR
#define SEPCHAR ':'
#endif
installed locations, but we can find them\n\
near where the Emacs executable was found.");
Vinstallation_directory = Qnil;
+
+ DEFVAR_LISP ("messages-locale", &Vmessages_locale,
+ "System locale for messages.");
+ Vmessages_locale = Qnil;
+
+ DEFVAR_LISP ("previous-messages-locale", &Vprevious_messages_locale,
+ "Most recently used system locale for messages.");
+ Vprevious_messages_locale = Qnil;
+
+ DEFVAR_LISP ("time-locale", &Vtime_locale,
+ "System locale for time.");
+ Vtime_locale = Qnil;
+
+ DEFVAR_LISP ("previous-time-locale", &Vprevious_time_locale,
+ "Most recently used system locale for time.");
+ Vprevious_time_locale = Qnil;
}
HCoop / bpt / emacs.git / blobdiff