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

[Richard M . Stallman]

Index: emacs/src/undo.c
diff -c emacs/src/undo.c:1.62 emacs/src/undo.c:1.63
*** emacs/src/undo.c:1.62       Tue Dec 21 11:31:24 2004
--- emacs/src/undo.c    Thu Dec 23 00:15:23 2004
***************
*** 28,34 ****
  
  EMACS_INT undo_limit;
  EMACS_INT undo_strong_limit;
! EMACS_INT undo_outer_limit;
  
  /* Function to call when undo_outer_limit is exceeded.  */
  
--- 28,35 ----
  
  EMACS_INT undo_limit;
  EMACS_INT undo_strong_limit;
! 
! Lisp_Object Vundo_outer_limit;
  
  /* Function to call when undo_outer_limit is exceeded.  */
  
***************
*** 368,374 ****
  
    /* If by the first boundary we have already passed undo_outer_limit,
       we're heading for memory full, so offer to clear out the list.  */
!   if (size_so_far > undo_outer_limit
        && !NILP (Vundo_outer_limit_function))
      {
        Lisp_Object temp = last_undo_buffer;
--- 369,376 ----
  
    /* If by the first boundary we have already passed undo_outer_limit,
       we're heading for memory full, so offer to clear out the list.  */
!   if (INTEGERP (Vundo_outer_limit)
!       && size_so_far > XINT (Vundo_outer_limit)
        && !NILP (Vundo_outer_limit_function))
      {
        Lisp_Object temp = last_undo_buffer;
***************
*** 622,628 ****
  which includes both saved text and other data.  */);
    undo_strong_limit = 30000;
  
!   DEFVAR_INT ("undo-outer-limit", &undo_outer_limit,
              doc: /* Outer limit on size of undo information for one command.
  At garbage collection time, if the current command has produced
  more than this much undo information, it asks you whether to delete
--- 624,630 ----
  which includes both saved text and other data.  */);
    undo_strong_limit = 30000;
  
!   DEFVAR_LISP ("undo-outer-limit", &Vundo_outer_limit,
              doc: /* Outer limit on size of undo information for one command.
  At garbage collection time, if the current command has produced
  more than this much undo information, it asks you whether to delete
***************
*** 635,641 ****
  `undo-outer-limit-function' with one argument, the size.
  The text above describes the behavior of the function
  that variable usually specifies.  */);
!   undo_outer_limit = 300000;
  
    DEFVAR_LISP ("undo-outer-limit-function", &Vundo_outer_limit_function,
               doc: /* Function to call when an undo list exceeds 
`undo-outer-limit'.
--- 637,643 ----
  `undo-outer-limit-function' with one argument, the size.
  The text above describes the behavior of the function
  that variable usually specifies.  */);
!   Vundo_outer_limit = make_number (300000);
  
    DEFVAR_LISP ("undo-outer-limit-function", &Vundo_outer_limit_function,
               doc: /* Function to call when an undo list exceeds 
`undo-outer-limit'.