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

[Juanma Barranquero]

Index: emacs/src/eval.c
diff -c emacs/src/eval.c:1.190 emacs/src/eval.c:1.191
*** emacs/src/eval.c:1.190      Sun Jul  7 06:07:32 2002
--- emacs/src/eval.c    Thu Jul 11 10:11:04 2002
***************
*** 231,237 ****
       Lisp_Object arg;
  {
    int debug_while_redisplaying;
!   int count = specpdl_ptr - specpdl;
    Lisp_Object val;
    
    if (lisp_eval_depth + 20 > max_lisp_eval_depth)
--- 231,237 ----
       Lisp_Object arg;
  {
    int debug_while_redisplaying;
!   int count = SPECPDL_INDEX ();
    Lisp_Object val;
    
    if (lisp_eval_depth + 20 > max_lisp_eval_depth)
***************
*** 864,870 ****
       Lisp_Object args;
  {
    Lisp_Object varlist, val, elt;
!   int count = specpdl_ptr - specpdl;
    struct gcpro gcpro1, gcpro2, gcpro3;
  
    GCPRO3 (args, elt, varlist);
--- 864,870 ----
       Lisp_Object args;
  {
    Lisp_Object varlist, val, elt;
!   int count = SPECPDL_INDEX ();
    struct gcpro gcpro1, gcpro2, gcpro3;
  
    GCPRO3 (args, elt, varlist);
***************
*** 904,910 ****
  {
    Lisp_Object *temps, tem;
    register Lisp_Object elt, varlist;
!   int count = specpdl_ptr - specpdl;
    register int argnum;
    struct gcpro gcpro1, gcpro2;
  
--- 904,910 ----
  {
    Lisp_Object *temps, tem;
    register Lisp_Object elt, varlist;
!   int count = SPECPDL_INDEX ();
    register int argnum;
    struct gcpro gcpro1, gcpro2;
  
***************
*** 1095,1101 ****
    c.backlist = backtrace_list;
    c.handlerlist = handlerlist;
    c.lisp_eval_depth = lisp_eval_depth;
!   c.pdlcount = specpdl_ptr - specpdl;
    c.poll_suppress_count = poll_suppress_count;
    c.gcpro = gcprolist;
    c.byte_stack = byte_stack_list;
--- 1095,1101 ----
    c.backlist = backtrace_list;
    c.handlerlist = handlerlist;
    c.lisp_eval_depth = lisp_eval_depth;
!   c.pdlcount = SPECPDL_INDEX ();
    c.poll_suppress_count = poll_suppress_count;
    c.gcpro = gcprolist;
    c.byte_stack = byte_stack_list;
***************
*** 1196,1202 ****
       Lisp_Object args;
  {
    Lisp_Object val;
!   int count = specpdl_ptr - specpdl;
  
    record_unwind_protect (0, Fcdr (args));
    val = Feval (Fcar (args));
--- 1196,1202 ----
       Lisp_Object args;
  {
    Lisp_Object val;
!   int count = SPECPDL_INDEX ();
  
    record_unwind_protect (0, Fcdr (args));
    val = Feval (Fcar (args));
***************
*** 1262,1268 ****
    c.backlist = backtrace_list;
    c.handlerlist = handlerlist;
    c.lisp_eval_depth = lisp_eval_depth;
!   c.pdlcount = specpdl_ptr - specpdl;
    c.poll_suppress_count = poll_suppress_count;
    c.gcpro = gcprolist;
    c.byte_stack = byte_stack_list;
--- 1262,1268 ----
    c.backlist = backtrace_list;
    c.handlerlist = handlerlist;
    c.lisp_eval_depth = lisp_eval_depth;
!   c.pdlcount = SPECPDL_INDEX ();
    c.poll_suppress_count = poll_suppress_count;
    c.gcpro = gcprolist;
    c.byte_stack = byte_stack_list;
***************
*** 1327,1333 ****
    c.backlist = backtrace_list;
    c.handlerlist = handlerlist;
    c.lisp_eval_depth = lisp_eval_depth;
!   c.pdlcount = specpdl_ptr - specpdl;
    c.poll_suppress_count = poll_suppress_count;
    c.gcpro = gcprolist;
    c.byte_stack = byte_stack_list;
--- 1327,1333 ----
    c.backlist = backtrace_list;
    c.handlerlist = handlerlist;
    c.lisp_eval_depth = lisp_eval_depth;
!   c.pdlcount = SPECPDL_INDEX ();
    c.poll_suppress_count = poll_suppress_count;
    c.gcpro = gcprolist;
    c.byte_stack = byte_stack_list;
***************
*** 1367,1373 ****
    c.backlist = backtrace_list;
    c.handlerlist = handlerlist;
    c.lisp_eval_depth = lisp_eval_depth;
!   c.pdlcount = specpdl_ptr - specpdl;
    c.poll_suppress_count = poll_suppress_count;
    c.gcpro = gcprolist;
    c.byte_stack = byte_stack_list;
--- 1367,1373 ----
    c.backlist = backtrace_list;
    c.handlerlist = handlerlist;
    c.lisp_eval_depth = lisp_eval_depth;
!   c.pdlcount = SPECPDL_INDEX ();
    c.poll_suppress_count = poll_suppress_count;
    c.gcpro = gcprolist;
    c.byte_stack = byte_stack_list;
***************
*** 1410,1416 ****
    c.backlist = backtrace_list;
    c.handlerlist = handlerlist;
    c.lisp_eval_depth = lisp_eval_depth;
!   c.pdlcount = specpdl_ptr - specpdl;
    c.poll_suppress_count = poll_suppress_count;
    c.gcpro = gcprolist;
    c.byte_stack = byte_stack_list;
--- 1410,1416 ----
    c.backlist = backtrace_list;
    c.handlerlist = handlerlist;
    c.lisp_eval_depth = lisp_eval_depth;
!   c.pdlcount = SPECPDL_INDEX ();
    c.poll_suppress_count = poll_suppress_count;
    c.gcpro = gcprolist;
    c.byte_stack = byte_stack_list;
***************
*** 1646,1652 ****
        || !NILP (Vdebug_on_signal)) /* This says call debugger even if
                                      there is a handler.  */
      {
!       int count = specpdl_ptr - specpdl;
        int debugger_called = 0;
        Lisp_Object sig_symbol, combined_data;
        /* This is set to 1 if we are handling a memory-full error,
--- 1646,1652 ----
        || !NILP (Vdebug_on_signal)) /* This says call debugger even if
                                      there is a handler.  */
      {
!       int count = SPECPDL_INDEX ();
        int debugger_called = 0;
        Lisp_Object sig_symbol, combined_data;
        /* This is set to 1 if we are handling a memory-full error,
***************
*** 1914,1920 ****
  do_autoload (fundef, funname)
       Lisp_Object fundef, funname;
  {
!   int count = specpdl_ptr - specpdl;
    Lisp_Object fun, queue, first, second;
    struct gcpro gcpro1, gcpro2, gcpro3;
  
--- 1914,1920 ----
  do_autoload (fundef, funname)
       Lisp_Object fundef, funname;
  {
!   int count = SPECPDL_INDEX ();
    Lisp_Object fun, queue, first, second;
    struct gcpro gcpro1, gcpro2, gcpro3;
  
***************
*** 2860,2866 ****
       register Lisp_Object *arg_vector;
  {
    Lisp_Object val, syms_left, next;
!   int count = specpdl_ptr - specpdl;
    int i, optional, rest;
  
    if (CONSP (fun))
--- 2860,2866 ----
       register Lisp_Object *arg_vector;
  {
    Lisp_Object val, syms_left, next;
!   int count = SPECPDL_INDEX ();
    int i, optional, rest;
  
    if (CONSP (fun))
***************
*** 2953,2959 ****
  void
  grow_specpdl ()
  {
!   register int count = specpdl_ptr - specpdl;
    if (specpdl_size >= max_specpdl_size)
      {
        if (max_specpdl_size < 400)
--- 2953,2959 ----
  void
  grow_specpdl ()
  {
!   register int count = SPECPDL_INDEX ();
    if (specpdl_size >= max_specpdl_size)
      {
        if (max_specpdl_size < 400)