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

[Ken Raeburn]

Index: emacs/src/emacs.c
diff -c emacs/src/emacs.c:1.311 emacs/src/emacs.c:1.312
*** emacs/src/emacs.c:1.311     Thu Jul 11 10:10:47 2002
--- emacs/src/emacs.c   Sun Jul 14 20:00:36 2002
***************
*** 743,749 ****
    if (!STRINGP(temp))
      return REPORT_EMACS_BUG_ADDRESS;
  
!   string = XSTRING (temp)->data;
  
    /* Count dots in `emacs-version'.  */
    while (*string)
--- 743,749 ----
    if (!STRINGP(temp))
      return REPORT_EMACS_BUG_ADDRESS;
  
!   string = SDATA (temp);
  
    /* Count dots in `emacs-version'.  */
    while (*string)
***************
*** 817,823 ****
        }
        else
        {
!         printf ("GNU Emacs %s\n", XSTRING (tem)->data);
          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");
--- 817,823 ----
        }
        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");
***************
*** 1908,1914 ****
       kill it because we are exiting Emacs deliberately (not crashing).
       Do it after shut_down_emacs, which does an auto-save.  */
    if (STRINGP (Vauto_save_list_file_name))
!     unlink (XSTRING (Vauto_save_list_file_name)->data);
  
    exit (INTEGERP (arg) ? XINT (arg)
  #ifdef VMS
--- 1908,1914 ----
       kill it because we are exiting Emacs deliberately (not crashing).
       Do it after shut_down_emacs, which does an auto-save.  */
    if (STRINGP (Vauto_save_list_file_name))
!     unlink (SDATA (Vauto_save_list_file_name));
  
    exit (INTEGERP (arg) ? XINT (arg)
  #ifdef VMS
***************
*** 1977,1984 ****
  #ifdef HAVE_X_WINDOWS
    /* It's not safe to call intern here.  Maybe we are crashing.  */
    if (!noninteractive && SYMBOLP (Vwindow_system)
!       && XSTRING (SYMBOL_NAME (Vwindow_system))->size == 1
!       && XSTRING (SYMBOL_NAME (Vwindow_system))->data[0] == 'x'
        && ! no_x)
      Fx_close_current_connection ();
  #endif /* HAVE_X_WINDOWS */
--- 1977,1984 ----
  #ifdef HAVE_X_WINDOWS
    /* It's not safe to call intern here.  Maybe we are crashing.  */
    if (!noninteractive && SYMBOLP (Vwindow_system)
!       && SCHARS (SYMBOL_NAME (Vwindow_system)) == 1
!       && SREF (SYMBOL_NAME (Vwindow_system), 0) == 'x'
        && ! no_x)
      Fx_close_current_connection ();
  #endif /* HAVE_X_WINDOWS */
***************
*** 2036,2042 ****
  #ifndef SYSTEM_MALLOC
    memory_warnings (my_edata, malloc_warning);
  #endif
!   map_out_data (XSTRING (filename)->data);
  
    Vpurify_flag = tem;
  
--- 2036,2042 ----
  #ifndef SYSTEM_MALLOC
    memory_warnings (my_edata, malloc_warning);
  #endif
!   map_out_data (SDATA (filename));
  
    Vpurify_flag = tem;
  
***************
*** 2075,2081 ****
    if (!NILP (symfile))
      {
        CHECK_STRING (symfile);
!       if (XSTRING (symfile)->size)
        symfile = Fexpand_file_name (symfile, Qnil);
      }
  
--- 2075,2081 ----
    if (!NILP (symfile))
      {
        CHECK_STRING (symfile);
!       if (SCHARS (symfile))
        symfile = Fexpand_file_name (symfile, Qnil);
      }
  
***************
*** 2092,2098 ****
  
    fflush (stdout);
  #ifdef VMS
!   mapout_data (XSTRING (filename)->data);
  #else
    /* Tell malloc where start of impure now is.  */
    /* Also arrange for warnings when nearly out of space.  */
--- 2092,2098 ----
  
    fflush (stdout);
  #ifdef VMS
!   mapout_data (SDATA (filename));
  #else
    /* Tell malloc where start of impure now is.  */
    /* Also arrange for warnings when nearly out of space.  */
***************
*** 2110,2117 ****
  #ifdef USE_MMAP_FOR_BUFFERS
    mmap_set_vars (0);
  #endif
!   unexec (XSTRING (filename)->data,
!         !NILP (symfile) ? XSTRING (symfile)->data : 0, my_edata, 0, 0);
  #ifdef USE_MMAP_FOR_BUFFERS
    mmap_set_vars (1);
  #endif
--- 2110,2117 ----
  #ifdef USE_MMAP_FOR_BUFFERS
    mmap_set_vars (0);
  #endif
!   unexec (SDATA (filename),
!         !NILP (symfile) ? SDATA (symfile) : 0, my_edata, 0, 0);
  #ifdef USE_MMAP_FOR_BUFFERS
    mmap_set_vars (1);
  #endif
***************
*** 2151,2157 ****
      {
        *plocale = desired_locale;
        setlocale (category, (STRINGP (desired_locale)
!                           ? (char *)(XSTRING (desired_locale)->data)
                            : ""));
      }
  }
--- 2151,2157 ----
      {
        *plocale = desired_locale;
        setlocale (category, (STRINGP (desired_locale)
!                           ? (char *)(SDATA (desired_locale))
                            : ""));
      }
  }