/[emacs]/emacs/src/emacs.c
ViewVC logotype

Diff of /emacs/src/emacs.c

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 1.311 by lektu, Thu Jul 11 14:10:47 2002 UTC revision 1.312 by raeburn, Mon Jul 15 00:00:36 2002 UTC
# Line 743  bug_reporting_address () Line 743  bug_reporting_address ()
743    if (!STRINGP(temp))    if (!STRINGP(temp))
744      return REPORT_EMACS_BUG_ADDRESS;      return REPORT_EMACS_BUG_ADDRESS;
745    
746    string = XSTRING (temp)->data;    string = SDATA (temp);
747    
748    /* Count dots in `emacs-version'.  */    /* Count dots in `emacs-version'.  */
749    while (*string)    while (*string)
# Line 817  main (argc, argv, envp) Line 817  main (argc, argv, envp)
817          }          }
818        else        else
819          {          {
820            printf ("GNU Emacs %s\n", XSTRING (tem)->data);            printf ("GNU Emacs %s\n", SDATA (tem));
821            printf ("Copyright (C) 2002 Free Software Foundation, Inc.\n");            printf ("Copyright (C) 2002 Free Software Foundation, Inc.\n");
822            printf ("GNU Emacs comes with ABSOLUTELY NO WARRANTY.\n");            printf ("GNU Emacs comes with ABSOLUTELY NO WARRANTY.\n");
823            printf ("You may redistribute copies of Emacs\n");            printf ("You may redistribute copies of Emacs\n");
# Line 1908  all of which are called before Emacs is Line 1908  all of which are called before Emacs is
1908       kill it because we are exiting Emacs deliberately (not crashing).       kill it because we are exiting Emacs deliberately (not crashing).
1909       Do it after shut_down_emacs, which does an auto-save.  */       Do it after shut_down_emacs, which does an auto-save.  */
1910    if (STRINGP (Vauto_save_list_file_name))    if (STRINGP (Vauto_save_list_file_name))
1911      unlink (XSTRING (Vauto_save_list_file_name)->data);      unlink (SDATA (Vauto_save_list_file_name));
1912    
1913    exit (INTEGERP (arg) ? XINT (arg)    exit (INTEGERP (arg) ? XINT (arg)
1914  #ifdef VMS  #ifdef VMS
# Line 1977  shut_down_emacs (sig, no_x, stuff) Line 1977  shut_down_emacs (sig, no_x, stuff)
1977  #ifdef HAVE_X_WINDOWS  #ifdef HAVE_X_WINDOWS
1978    /* It's not safe to call intern here.  Maybe we are crashing.  */    /* It's not safe to call intern here.  Maybe we are crashing.  */
1979    if (!noninteractive && SYMBOLP (Vwindow_system)    if (!noninteractive && SYMBOLP (Vwindow_system)
1980        && XSTRING (SYMBOL_NAME (Vwindow_system))->size == 1        && SCHARS (SYMBOL_NAME (Vwindow_system)) == 1
1981        && XSTRING (SYMBOL_NAME (Vwindow_system))->data[0] == 'x'        && SREF (SYMBOL_NAME (Vwindow_system), 0) == 'x'
1982        && ! no_x)        && ! no_x)
1983      Fx_close_current_connection ();      Fx_close_current_connection ();
1984  #endif /* HAVE_X_WINDOWS */  #endif /* HAVE_X_WINDOWS */
# Line 2036  This function exists on systems that use Line 2036  This function exists on systems that use
2036  #ifndef SYSTEM_MALLOC  #ifndef SYSTEM_MALLOC
2037    memory_warnings (my_edata, malloc_warning);    memory_warnings (my_edata, malloc_warning);
2038  #endif  #endif
2039    map_out_data (XSTRING (filename)->data);    map_out_data (SDATA (filename));
2040    
2041    Vpurify_flag = tem;    Vpurify_flag = tem;
2042    
# Line 2075  You must run Emacs in batch mode in orde Line 2075  You must run Emacs in batch mode in orde
2075    if (!NILP (symfile))    if (!NILP (symfile))
2076      {      {
2077        CHECK_STRING (symfile);        CHECK_STRING (symfile);
2078        if (XSTRING (symfile)->size)        if (SCHARS (symfile))
2079          symfile = Fexpand_file_name (symfile, Qnil);          symfile = Fexpand_file_name (symfile, Qnil);
2080      }      }
2081    
# Line 2092  You must run Emacs in batch mode in orde Line 2092  You must run Emacs in batch mode in orde
2092    
2093    fflush (stdout);    fflush (stdout);
2094  #ifdef VMS  #ifdef VMS
2095    mapout_data (XSTRING (filename)->data);    mapout_data (SDATA (filename));
2096  #else  #else
2097    /* Tell malloc where start of impure now is.  */    /* Tell malloc where start of impure now is.  */
2098    /* Also arrange for warnings when nearly out of space.  */    /* Also arrange for warnings when nearly out of space.  */
# Line 2110  You must run Emacs in batch mode in orde Line 2110  You must run Emacs in batch mode in orde
2110  #ifdef USE_MMAP_FOR_BUFFERS  #ifdef USE_MMAP_FOR_BUFFERS
2111    mmap_set_vars (0);    mmap_set_vars (0);
2112  #endif  #endif
2113    unexec (XSTRING (filename)->data,    unexec (SDATA (filename),
2114            !NILP (symfile) ? XSTRING (symfile)->data : 0, my_edata, 0, 0);            !NILP (symfile) ? SDATA (symfile) : 0, my_edata, 0, 0);
2115  #ifdef USE_MMAP_FOR_BUFFERS  #ifdef USE_MMAP_FOR_BUFFERS
2116    mmap_set_vars (1);    mmap_set_vars (1);
2117  #endif  #endif
# Line 2151  synchronize_locale (category, plocale, d Line 2151  synchronize_locale (category, plocale, d
2151      {      {
2152        *plocale = desired_locale;        *plocale = desired_locale;
2153        setlocale (category, (STRINGP (desired_locale)        setlocale (category, (STRINGP (desired_locale)
2154                              ? (char *)(XSTRING (desired_locale)->data)                              ? (char *)(SDATA (desired_locale))
2155                              : ""));                              : ""));
2156      }      }
2157  }  }

Legend:
Removed from v.1.311  
changed lines
  Added in v.1.312

savannah-hackers-public@gnu.org
ViewVC Help
Powered by ViewVC 1.1.26