#include <unistd.h>
#endif
-#ifdef HAVE_SYS_IOCTL_H
-#include <sys/ioctl.h>
-#endif
-
#ifdef WINDOWSNT
#include <fcntl.h>
#include <windows.h> /* just for w32.h */
#include "keyboard.h"
#include "keymap.h"
+#ifdef HAVE_NS
+#include "nsterm.h"
+#endif
+
#ifdef HAVE_SETLOCALE
#include <locale.h>
#endif
#endif
#endif
-const char emacs_copyright[] = "Copyright (C) 2010 Free Software Foundation, Inc.";
-const char emacs_version[] = "24.0.50";
+/* If you change the following line, remember to update
+ msdos/mainmake.v2 which gleans the Emacs version from it! */
+static const char emacs_copyright[] = "Copyright (C) 2010 Free Software Foundation, Inc.";
+static const char emacs_version[] = "24.0.50";
/* Make these values available in GDB, which doesn't see macros. */
output a warning in dump-emacs. */
#define MAX_HEAP_BSS_DIFF (1024*1024)
-
-#ifdef HAVE_WINDOW_SYSTEM
-extern Lisp_Object Vinitial_window_system;
-#endif /* HAVE_WINDOW_SYSTEM */
-
-extern Lisp_Object Vauto_save_list_file_name;
-
-extern Lisp_Object Vinhibit_redisplay;
-
/* Nonzero means running Emacs without interactive terminal. */
int noninteractive;
enough information to do it right. */
static int
-argmatch (char **argv, int argc, char *sstr, char *lstr, int minlen, char **valptr, int *skipptr)
+argmatch (char **argv, int argc, const char *sstr, const char *lstr, int minlen, char **valptr, int *skipptr)
{
char *p = NULL;
int arglen;
char *ch_to_dir;
#if GC_MARK_STACK
- extern Lisp_Object *stack_base;
stack_base = &dummy;
#endif
|| strcmp (argv[argc-1], "bootstrap") == 0)
&& ! getenv ("EMACS_HEAP_EXEC"))
{
+ static char heapexec[] = "EMACS_HEAP_EXEC=true";
/* Set this so we only do this once. */
- putenv("EMACS_HEAP_EXEC=true");
+ putenv(heapexec);
/* A flag to turn off address randomization which is introduced
in linux kernel shipped with fedora core 4 */
}
#endif /* HAVE_PERSONALITY_LINUX32 */
-
-/* Map in shared memory, if we are using that. */
-#ifdef HAVE_SHM
- if (argmatch (argv, argc, "-nl", "--no-shared-memory", 6, NULL, &skip_args))
- {
- map_in_data (0);
- /* The shared memory was just restored, which clobbered this. */
- skip_args = 1;
- }
- else
- {
- map_in_data (1);
- /* The shared memory was just restored, which clobbered this. */
- skip_args = 0;
- }
-#endif
-
#if defined (HAVE_SETRLIMIT) && defined (RLIMIT_STACK)
/* Extend the stack space available.
Don't do that if dumping, since some systems (e.g. DJGPP)
#ifdef AIX
/* 20 is SIGCHLD, 21 is SIGTTIN, 22 is SIGTTOU. */
signal (SIGXCPU, fatal_error_signal);
-#ifndef _I386
signal (SIGIOINT, fatal_error_signal);
-#endif
signal (SIGGRANT, fatal_error_signal);
signal (SIGRETRACT, fatal_error_signal);
signal (SIGSOUND, fatal_error_signal);
init_atimer ();
running_asynch_code = 0;
- /* Handle --unibyte and the EMACS_UNIBYTE envvar,
- but not while dumping. */
- if (1)
- {
- int inhibit_unibyte = 0;
-
- /* --multibyte overrides EMACS_UNIBYTE. */
- if (argmatch (argv, argc, "-no-unibyte", "--no-unibyte", 4, NULL, &skip_args)
- || argmatch (argv, argc, "-multibyte", "--multibyte", 4, NULL, &skip_args)
- /* Ignore EMACS_UNIBYTE before dumping. */
- || (!initialized && noninteractive))
- inhibit_unibyte = 1;
-
- /* --unibyte requests that we set up to do everything with single-byte
- 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))
- {
- Lisp_Object old_log_max;
- Lisp_Object symbol, tail;
-
- symbol = intern_c_string ("enable-multibyte-characters");
- Fset_default (symbol, Qnil);
-
- 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 = XCDR (tail))
- {
- Lisp_Object buffer;
-
- buffer = Fcdr (XCAR (tail));
- /* Make a multibyte buffer unibyte. */
- if (BUF_Z_BYTE (XBUFFER (buffer)) > BUF_Z (XBUFFER (buffer)))
- {
- struct buffer *current = current_buffer;
-
- set_buffer_temp (XBUFFER (buffer));
- Fset_buffer_multibyte (Qnil);
- set_buffer_temp (current);
- }
- }
- message ("Warning: unibyte sessions are obsolete and will disappear");
- }
- }
-
no_loadup
= argmatch (argv, argc, "-nl", "--no-loadup", 6, NULL, &skip_args);
#endif
#endif /* HAVE_X_WINDOWS */
+#ifdef HAVE_LIBXML2
+ syms_of_xml ();
+#endif
+
syms_of_menu ();
#ifdef HAVE_NTGUI
{ "-script", "--script", 100, 1 },
{ "-daemon", "--daemon", 99, 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 },
{ "-nl", "--no-loadup", 70, 0 },
/* -d must come last before the options handled in startup.el. */
{ "-d", "--display", 60, 1 },
unlink (SDATA (Vauto_save_list_file_name));
exit (INTEGERP (arg) ? XINT (arg) : EXIT_SUCCESS);
- /* NOTREACHED */
- return Qnil;
}
Vinhibit_redisplay = Qt;
/* If we are controlling the terminal, reset terminal modes. */
-#ifdef EMACS_HAVE_TTY_PGRP
+#ifndef DOS_NT
{
int pgrp = EMACS_GETPGRP (0);