Merge from emacs--devo--0

[gnu-emacs] / src / emacs.c

diff --git a/src/emacs.c b/src/emacs.c
index 1f8ec6a268f7a83129be26650d7d93fe92c1bc32..e23f8083a31bbeba71b4b3446736262d61bb4cd9 100644 (file)
--- a/src/emacs.c
+++ b/src/emacs.c
@@ -6,7 +6,7 @@ This file is part of GNU Emacs.
 
 GNU Emacs is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
 
 GNU Emacs is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by

-the Free Software Foundation; either version 2, or (at your option)
+the Free Software Foundation; either version 3, or (at your option)

 any later version.
 
 GNU Emacs is distributed in the hope that it will be useful,
 any later version.
 
 GNU Emacs is distributed in the hope that it will be useful,


@@ -134,8 +134,8 @@ Lisp_Object Vinstallation_directory;
 /* Hook run by `kill-emacs' before it does really anything.  */
 Lisp_Object Vkill_emacs_hook;
 
 /* Hook run by `kill-emacs' before it does really anything.  */
 Lisp_Object Vkill_emacs_hook;
 

-/* An empty lisp string.  To avoid having to build any other.  */
-Lisp_Object empty_string;
+/* Empty lisp strings.  To avoid having to build any others.  */
+Lisp_Object empty_unibyte_string, empty_multibyte_string;

 
 /* Search path separator.  */
 Lisp_Object Vpath_separator;
 
 /* Search path separator.  */
 Lisp_Object Vpath_separator;


@@ -756,7 +756,7 @@ void (*__malloc_initialize_hook) () = malloc_initialize_hook;
 
 
 #define REPORT_EMACS_BUG_ADDRESS "bug-gnu-emacs@gnu.org"
 
 
 #define REPORT_EMACS_BUG_ADDRESS "bug-gnu-emacs@gnu.org"

-#define REPORT_EMACS_BUG_PRETEST_ADDRESS "multi-tty@lists.fnord.hu"
+#define REPORT_EMACS_BUG_PRETEST_ADDRESS "emacs-pretest-bug@gnu.org"

 
 /* This function is used to determine an address to which bug report should
    be sent.  */
 
 /* This function is used to determine an address to which bug report should
    be sent.  */


@@ -857,17 +857,23 @@ main (argc, argv
          So ignore --version otherwise.  */
       && initialized)
     {
          So ignore --version otherwise.  */
       && initialized)
     {

-      Lisp_Object tem;
+      Lisp_Object tem, tem2;

       tem = Fsymbol_value (intern ("emacs-version"));
       tem = Fsymbol_value (intern ("emacs-version"));

+      tem2 = Fsymbol_value (intern ("emacs-copyright"));

       if (!STRINGP (tem))
        {
          fprintf (stderr, "Invalid value of `emacs-version'\n");
          exit (1);
        }
       if (!STRINGP (tem))
        {
          fprintf (stderr, "Invalid value of `emacs-version'\n");
          exit (1);
        }

+      if (!STRINGP (tem2))
+       {
+         fprintf (stderr, "Invalid value of `emacs-copyright'\n");
+         exit (1);
+       }

       else
        {
          printf ("GNU Emacs %s\n", SDATA (tem));
       else
        {
          printf ("GNU Emacs %s\n", SDATA (tem));

-         printf ("Copyright (C) 2007 Free Software Foundation, Inc.\n");
+         printf ("%s\n", SDATA(tem2));

          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");
          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");


@@ -1158,6 +1164,13 @@ main (argc, argv
 #if defined (USG5) && defined (INTERRUPT_INPUT)
       setpgrp ();
 #endif
 #if defined (USG5) && defined (INTERRUPT_INPUT)
       setpgrp ();
 #endif

+#endif
+#if defined (HAVE_GTK_AND_PTHREAD) && !defined (SYSTEM_MALLOC) && !defined (DOUG_LEA_MALLOC)
+      {
+       extern void malloc_enable_thread P_ ((void));
+
+       malloc_enable_thread ();
+      }

 #endif
     }
 
 #endif
     }
 


@@ -2471,9 +2484,6 @@ see `kill-emacs-query-functions' instead.
 The hook is not run in batch mode, i.e., if `noninteractive' is non-nil.  */);
   Vkill_emacs_hook = Qnil;
 
 The hook is not run in batch mode, i.e., if `noninteractive' is non-nil.  */);
   Vkill_emacs_hook = Qnil;
 

-  empty_string = build_string ("");
-  staticpro (&empty_string);
-

   DEFVAR_INT ("emacs-priority", &emacs_priority,
              doc: /* Priority for Emacs to run at.
 This value is effective only if set before Emacs is dumped,
   DEFVAR_INT ("emacs-priority", &emacs_priority,
              doc: /* Priority for Emacs to run at.
 This value is effective only if set before Emacs is dumped,