[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.8 emacs/src/emacs.c:1.328.4.9
*** emacs/src/emacs.c:1.328.4.8 Fri Nov 12 02:52:55 2004
--- emacs/src/emacs.c   Wed Dec  8 05:02:18 2004
***************
*** 580,587 ****
    for (i = argc - 1; i >= 0; i--)
      {
        if (i == 0 || i > skip_args)
        Vcommand_line_args
!         = Fcons (build_string (argv[i]), Vcommand_line_args);
      }
  
    unbind_to (count, Qnil);
--- 580,591 ----
    for (i = argc - 1; i >= 0; i--)
      {
        if (i == 0 || i > skip_args)
+       /* For the moment, we keep arguments as is in unibyte strings.
+          They are decoded in the function command-line after we know
+          locale-coding-system.  */
        Vcommand_line_args
!         = Fcons (make_unibyte_string (argv[i], strlen (argv[i])),
!                  Vcommand_line_args);
      }
  
    unbind_to (count, Qnil);
***************
*** 744,750 ****
--- 748,756 ----
        }
  
        malloc_set_state (malloc_state_ptr);
+ #ifndef XMALLOC_OVERRUN_CHECK
        free (malloc_state_ptr);
+ #endif
      }
    else
      {
***************
*** 1988,1996 ****
  
    bcopy (new, argv, sizeof (char *) * argc);
  
!   free (options);
!   free (new);
!   free (priority);
  }
  
  DEFUN ("kill-emacs", Fkill_emacs, Skill_emacs, 0, 1, "P",
--- 1994,2002 ----
  
    bcopy (new, argv, sizeof (char *) * argc);
  
!   xfree (options);
!   xfree (new);
!   xfree (priority);
  }
  
  DEFUN ("kill-emacs", Fkill_emacs, Skill_emacs, 0, 1, "P",
***************
*** 2240,2245 ****
--- 2246,2257 ----
    memory_warnings (my_edata, malloc_warning);
  #endif /* not WINDOWSNT */
  #endif
+ #if ! defined (SYSTEM_MALLOC) && defined (HAVE_GTK_AND_PTHREAD)
+   /* Pthread may call malloc before main, and then we will get an endless
+      loop, because pthread_self (see alloc.c) calls malloc the first time
+      it is called on some systems.  */
+   reset_malloc_hooks ();
+ #endif
  #ifdef DOUG_LEA_MALLOC
    malloc_state_ptr = malloc_get_state ();
  #endif