comparison src/emacs.c @ 90054:f2ebccfa87d4

Revision: miles@gnu.org--gnu-2004/emacs--unicode--0--patch-74 Merge from emacs--cvs-trunk--0 Patches applied: * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-709 Update from CVS: src/indent.c (Fvertical_motion): Fix last change. * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-710 - miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-715 Update from CVS * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-716 Merge from gnus--rel--5.10 * miles@gnu.org--gnu-2004/gnus--rel--5.10--patch-74 Update from CVS
author Miles Bader <miles@gnu.org>
date Wed, 08 Dec 2004 05:02:30 +0000
parents cb7f41387eb3 9f7c2511d457
children fb79180b618d
comparison
equal deleted inserted replaced
90053:fff5f1a61d92 90054:f2ebccfa87d4
578 Vcommand_line_args = Qnil; 578 Vcommand_line_args = Qnil;
579 579
580 for (i = argc - 1; i >= 0; i--) 580 for (i = argc - 1; i >= 0; i--)
581 { 581 {
582 if (i == 0 || i > skip_args) 582 if (i == 0 || i > skip_args)
583 /* For the moment, we keep arguments as is in unibyte strings.
584 They are decoded in the function command-line after we know
585 locale-coding-system. */
583 Vcommand_line_args 586 Vcommand_line_args
584 = Fcons (build_string (argv[i]), Vcommand_line_args); 587 = Fcons (make_unibyte_string (argv[i], strlen (argv[i])),
588 Vcommand_line_args);
585 } 589 }
586 590
587 unbind_to (count, Qnil); 591 unbind_to (count, Qnil);
588 } 592 }
589 593
742 break; 746 break;
743 } 747 }
744 } 748 }
745 749
746 malloc_set_state (malloc_state_ptr); 750 malloc_set_state (malloc_state_ptr);
751 #ifndef XMALLOC_OVERRUN_CHECK
747 free (malloc_state_ptr); 752 free (malloc_state_ptr);
753 #endif
748 } 754 }
749 else 755 else
750 { 756 {
751 if (my_heap_start == 0) 757 if (my_heap_start == 0)
752 my_heap_start = sbrk (0); 758 my_heap_start = sbrk (0);
1986 while (to < argc) 1992 while (to < argc)
1987 new[to++] = 0; 1993 new[to++] = 0;
1988 1994
1989 bcopy (new, argv, sizeof (char *) * argc); 1995 bcopy (new, argv, sizeof (char *) * argc);
1990 1996
1991 free (options); 1997 xfree (options);
1992 free (new); 1998 xfree (new);
1993 free (priority); 1999 xfree (priority);
1994 } 2000 }
1995 2001
1996 DEFUN ("kill-emacs", Fkill_emacs, Skill_emacs, 0, 1, "P", 2002 DEFUN ("kill-emacs", Fkill_emacs, Skill_emacs, 0, 1, "P",
1997 doc: /* Exit the Emacs job and kill it. 2003 doc: /* Exit the Emacs job and kill it.
1998 If ARG is an integer, return ARG as the exit program code. 2004 If ARG is an integer, return ARG as the exit program code.
2238 /* On Windows, this was done before dumping, and that once suffices. 2244 /* On Windows, this was done before dumping, and that once suffices.
2239 Meanwhile, my_edata is not valid on Windows. */ 2245 Meanwhile, my_edata is not valid on Windows. */
2240 memory_warnings (my_edata, malloc_warning); 2246 memory_warnings (my_edata, malloc_warning);
2241 #endif /* not WINDOWSNT */ 2247 #endif /* not WINDOWSNT */
2242 #endif 2248 #endif
2249 #if ! defined (SYSTEM_MALLOC) && defined (HAVE_GTK_AND_PTHREAD)
2250 /* Pthread may call malloc before main, and then we will get an endless
2251 loop, because pthread_self (see alloc.c) calls malloc the first time
2252 it is called on some systems. */
2253 reset_malloc_hooks ();
2254 #endif
2243 #ifdef DOUG_LEA_MALLOC 2255 #ifdef DOUG_LEA_MALLOC
2244 malloc_state_ptr = malloc_get_state (); 2256 malloc_state_ptr = malloc_get_state ();
2245 #endif 2257 #endif
2246 2258
2247 #ifdef USE_MMAP_FOR_BUFFERS 2259 #ifdef USE_MMAP_FOR_BUFFERS