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

[Kim F . Storm]

Index: emacs/src/emacs.c
diff -c emacs/src/emacs.c:1.348 emacs/src/emacs.c:1.349
*** emacs/src/emacs.c:1.348     Mon Nov 29 07:16:09 2004
--- emacs/src/emacs.c   Tue Nov 30 00:31:09 2004
***************
*** 584,590 ****
           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);
      }
  
--- 584,590 ----
           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);
      }
  
***************
*** 748,754 ****
--- 748,756 ----
        }
  
        malloc_set_state (malloc_state_ptr);
+ #ifndef XMALLOC_OVERRUN_CHECK
        free (malloc_state_ptr);
+ #endif
      }
    else
      {
***************
*** 1984,1992 ****
  
    bcopy (new, argv, sizeof (char *) * argc);
  
!   free (options);
!   free (new);
!   free (priority);
  }
  
  DEFUN ("kill-emacs", Fkill_emacs, Skill_emacs, 0, 1, "P",
--- 1986,1994 ----
  
    bcopy (new, argv, sizeof (char *) * argc);
  
!   xfree (options);
!   xfree (new);
!   xfree (priority);
  }
  
  DEFUN ("kill-emacs", Fkill_emacs, Skill_emacs, 0, 1, "P",