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

[Richard M. Stallman]

Index: emacs/src/alloc.c
diff -c emacs/src/alloc.c:1.279 emacs/src/alloc.c:1.280
*** emacs/src/alloc.c:1.279     Wed Aug  7 10:37:32 2002
--- emacs/src/alloc.c   Sun Sep  1 09:37:41 2002
***************
*** 22,27 ****
--- 22,31 ----
  #include <config.h>
  #include <stdio.h>
  
+ #ifdef ALLOC_DEBUG
+ #undef INLINE
+ #endif
+ 
  /* Note that this declares bzero on OSF/1.  How dumb.  */
  
  #include <signal.h>
***************
*** 422,444 ****
                                Malloc
   ************************************************************************/
  
! /* Write STR to Vstandard_output plus some advice on how to free some
!    memory.  Called when memory gets low.  */
! 
! Lisp_Object
! malloc_warning_1 (str)
!      Lisp_Object str;
! {
!   Fprinc (str, Vstandard_output);
!   write_string ("\nKilling some buffers may delay running out of memory.\n", 
-1);
!   write_string ("However, certainly by the time you receive the 95% 
warning,\n", -1);
!   write_string ("you should clean up, kill this Emacs, and start a new one.", 
-1);
!   return Qnil;
! }
! 
! 
! /* Function malloc calls this if it finds we are near exhausting
!    storage.  */
  
  void
  malloc_warning (str)
--- 426,432 ----
                                Malloc
   ************************************************************************/
  
! /* Function malloc calls this if it finds we are near exhausting storage.  */
  
  void
  malloc_warning (str)
***************
*** 448,463 ****
  }
  
  
! /* Display a malloc warning in buffer *Danger*.  */
  
  void
  display_malloc_warning ()
  {
!   register Lisp_Object val;
! 
!   val = build_string (pending_malloc_warning);
    pending_malloc_warning = 0;
-   internal_with_output_to_temp_buffer (" *Danger*", malloc_warning_1, val);
  }
  
  
--- 436,451 ----
  }
  
  
! /* Display an already-pending malloc warning.  */
  
  void
  display_malloc_warning ()
  {
!   call3 (intern ("display-warning"),
!        intern ("alloc"),
!        build_string (pending_malloc_warning),
!        intern ("emergency"));
    pending_malloc_warning = 0;
  }