[Emacs-diffs] Changes to emacs/src/emacs.c [emacs-unicode-2]

[Miles Bader]

Index: emacs/src/emacs.c
diff -c emacs/src/emacs.c:1.328.4.3 emacs/src/emacs.c:1.328.4.4
*** emacs/src/emacs.c:1.328.4.3 Fri Apr 16 12:50:46 2004
--- emacs/src/emacs.c   Mon Jun 28 07:29:20 2004
***************
*** 104,109 ****
--- 104,110 ----
  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,210 ****
--- 206,213 ----
  
  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,853 ****
        else
        {
          printf ("GNU Emacs %s\n", SDATA (tem));
!         printf ("Copyright (C) 2002 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");
--- 850,856 ----
        else
        {
          printf ("GNU Emacs %s\n", SDATA (tem));
!         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,900 ****
    /* If -map specified, map the data file in.  */
    {
      char *file;
!     if (argmatch (argv, argc, "-map", "--map-data", 3, &mapin_file, 
&skip_args))
        mapin_data (file);
    }
  
--- 897,903 ----
    /* If -map specified, map the data file in.  */
    {
      char *file;
!     if (argmatch (argv, argc, "-map", "--map-data", 3, &file, &skip_args))
        mapin_data (file);
    }
  
***************
*** 2016,2021 ****
--- 2019,2027 ----
    /* 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
    {