summaryrefslogtreecommitdiff
path: root/src/emacs.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/emacs.c')
-rw-r--r--src/emacs.c10
1 files changed, 8 insertions, 2 deletions
diff --git a/src/emacs.c b/src/emacs.c
index b27b460fba0..d348eb86d29 100644
--- a/src/emacs.c
+++ b/src/emacs.c
@@ -104,6 +104,7 @@ EMACS_INT gdb_data_seg_bits = DATA_SEG_BITS;
EMACS_INT gdb_data_seg_bits = 0;
#endif
EMACS_INT PVEC_FLAG = PSEUDOVECTOR_FLAG;
+EMACS_INT gdb_array_mark_flag = ARRAY_MARK_FLAG;
/* Command line args from shell, as list of strings. */
Lisp_Object Vcommand_line_args;
@@ -205,6 +206,8 @@ extern Lisp_Object Vwindow_system;
extern Lisp_Object Vauto_save_list_file_name;
+extern Lisp_Object Vinhibit_redisplay;
+
#ifdef USG_SHARED_LIBRARIES
/* If nonzero, this is the place to put the end of the writable segment
at startup. */
@@ -847,7 +850,7 @@ main (argc, argv
else
{
printf ("GNU Emacs %s\n", SDATA (tem));
- printf ("Copyright (C) 2002 Free Software Foundation, Inc.\n");
+ printf ("Copyright (C) 2004 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");
@@ -894,7 +897,7 @@ main (argc, argv
/* If -map specified, map the data file in. */
{
char *file;
- if (argmatch (argv, argc, "-map", "--map-data", 3, &mapin_file, &skip_args))
+ if (argmatch (argv, argc, "-map", "--map-data", 3, &file, &skip_args))
mapin_data (file);
}
@@ -2016,6 +2019,9 @@ shut_down_emacs (sig, no_x, stuff)
/* Prevent running of hooks from now on. */
Vrun_hooks = Qnil;
+ /* Don't update display from now on. */
+ Vinhibit_redisplay = Qt;
+
/* If we are controlling the terminal, reset terminal modes. */
#ifdef EMACS_HAVE_TTY_PGRP
{