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

[Juanma Barranquero]

Index: emacs/src/eval.c
diff -c emacs/src/eval.c:1.201 emacs/src/eval.c:1.202
*** emacs/src/eval.c:1.201      Tue Jan  7 14:33:57 2003
--- emacs/src/eval.c    Tue Feb  4 09:03:12 2003
***************
*** 234,246 ****
    int debug_while_redisplaying;
    int count = SPECPDL_INDEX ();
    Lisp_Object val;
!   
    if (lisp_eval_depth + 20 > max_lisp_eval_depth)
      max_lisp_eval_depth = lisp_eval_depth + 20;
!   
    if (specpdl_size + 40 > max_specpdl_size)
      max_specpdl_size = specpdl_size + 40;
!   
  #ifdef HAVE_X_WINDOWS
    if (display_hourglass_p)
      cancel_hourglass ();
--- 234,246 ----
    int debug_while_redisplaying;
    int count = SPECPDL_INDEX ();
    Lisp_Object val;
! 
    if (lisp_eval_depth + 20 > max_lisp_eval_depth)
      max_lisp_eval_depth = lisp_eval_depth + 20;
! 
    if (specpdl_size + 40 > max_specpdl_size)
      max_specpdl_size = specpdl_size + 40;
! 
  #ifdef HAVE_X_WINDOWS
    if (display_hourglass_p)
      cancel_hourglass ();
***************
*** 261,267 ****
         redisplay, which necessarily leads to display problems.  */
    specbind (Qinhibit_eval_during_redisplay, Qt);
  #endif
!   
    val = apply1 (Vdebugger, arg);
  
    /* Interrupting redisplay and resuming it later is not safe under
--- 261,267 ----
         redisplay, which necessarily leads to display problems.  */
    specbind (Qinhibit_eval_during_redisplay, Qt);
  #endif
! 
    val = apply1 (Vdebugger, arg);
  
    /* Interrupting redisplay and resuming it later is not safe under
***************
*** 535,541 ****
    UNGCPRO;
    return val;
  }
!      
  DEFUN ("quote", Fquote, Squote, 1, UNEVALLED, 0,
         doc: /* Return the argument, without evaluating it.  `(quote x)' 
yields `x'.
  usage: (quote ARG)  */)
--- 535,541 ----
    UNGCPRO;
    return val;
  }
! 
  DEFUN ("quote", Fquote, Squote, 1, UNEVALLED, 0,
         doc: /* Return the argument, without evaluating it.  `(quote x)' 
yields `x'.
  usage: (quote ARG)  */)
***************
*** 544,550 ****
  {
    return Fcar (args);
  }
!      
  DEFUN ("function", Ffunction, Sfunction, 1, UNEVALLED, 0,
         doc: /* Like `quote', but preferred for objects which are functions.
  In byte compilation, `function' causes its argument to be compiled.
--- 544,550 ----
  {
    return Fcar (args);
  }
! 
  DEFUN ("function", Ffunction, Sfunction, 1, UNEVALLED, 0,
         doc: /* Like `quote', but preferred for objects which are functions.
  In byte compilation, `function' causes its argument to be compiled.
***************
*** 614,620 ****
    fun = Findirect_function (*btp->function);
    if (exclude_subrs_p && SUBRP (fun))
      return 0;
!   
    /* btp points to the frame of a Lisp function that called interactive-p.
       Return t if that function was called interactively.  */
    if (btp && btp->next && EQ (*btp->next->function, Qcall_interactively))
--- 614,620 ----
    fun = Findirect_function (*btp->function);
    if (exclude_subrs_p && SUBRP (fun))
      return 0;
! 
    /* btp points to the frame of a Lisp function that called interactive-p.
       Return t if that function was called interactively.  */
    if (btp && btp->next && EQ (*btp->next->function, Qcall_interactively))
***************
*** 694,700 ****
          call2 (Vmacro_declaration_function, fn_name, Fcar (tail));
          UNGCPRO;
        }
!       
        tail = Fcdr (tail);
      }
  
--- 694,700 ----
          call2 (Vmacro_declaration_function, fn_name, Fcar (tail));
          UNGCPRO;
        }
! 
        tail = Fcdr (tail);
      }
  
***************
*** 703,709 ****
    else
      tail = Fcons (lambda_list, Fcons (doc, tail));
    defn = Fcons (Qmacro, Fcons (Qlambda, tail));
!   
    if (!NILP (Vpurify_flag))
      defn = Fpurecopy (defn);
    if (CONSP (XSYMBOL (fn_name)->function)
--- 703,709 ----
    else
      tail = Fcons (lambda_list, Fcons (doc, tail));
    defn = Fcons (Qmacro, Fcons (Qlambda, tail));
! 
    if (!NILP (Vpurify_flag))
      defn = Fpurecopy (defn);
    if (CONSP (XSYMBOL (fn_name)->function)
***************
*** 835,841 ****
       Lisp_Object variable;
  {
    Lisp_Object documentation;
!   
    if (!SYMBOLP (variable))
        return Qnil;
  
--- 835,841 ----
       Lisp_Object variable;
  {
    Lisp_Object documentation;
! 
    if (!SYMBOLP (variable))
        return Qnil;
  
***************
*** 856,862 ****
        || (!NILP (Fget (variable, intern ("custom-autoload")))))
      return Qt;
    return Qnil;
! }  
  
  DEFUN ("let*", FletX, SletX, 1, UNEVALLED, 0,
         doc: /* Bind variables according to VARLIST then eval BODY.
--- 856,862 ----
        || (!NILP (Fget (variable, intern ("custom-autoload")))))
      return Qt;
    return Qnil;
! }
  
  DEFUN ("let*", FletX, SletX, 1, UNEVALLED, 0,
         doc: /* Bind variables according to VARLIST then eval BODY.
***************
*** 1168,1174 ****
  #endif
    backtrace_list = catch->backlist;
    lisp_eval_depth = catch->lisp_eval_depth;
!   
    _longjmp (catch->jmp, 1);
  }
  
--- 1168,1174 ----
  #endif
    backtrace_list = catch->backlist;
    lisp_eval_depth = catch->lisp_eval_depth;
! 
    _longjmp (catch->jmp, 1);
  }
  
***************
*** 1207,1213 ****
  
    record_unwind_protect (0, Fcdr (args));
    val = Feval (Fcar (args));
!   return unbind_to (count, val);  
  }
  
  /* Chain of condition handlers currently in effect.
--- 1207,1213 ----
  
    record_unwind_protect (0, Fcdr (args));
    val = Feval (Fcar (args));
!   return unbind_to (count, val);
  }
  
  /* Chain of condition handlers currently in effect.
***************
*** 1288,1294 ****
      }
    c.next = catchlist;
    catchlist = &c;
!   
    h.var = var;
    h.handler = handlers;
    h.next = handlerlist;
--- 1288,1294 ----
      }
    c.next = catchlist;
    catchlist = &c;
! 
    h.var = var;
    h.handler = handlers;
    h.next = handlerlist;
***************
*** 1486,1492 ****
    if (display_hourglass_p)
      cancel_hourglass ();
  #endif
! #endif 
  
    /* This hook is used by edebug.  */
    if (! NILP (Vsignal_hook_function)
--- 1486,1492 ----
    if (display_hourglass_p)
      cancel_hourglass ();
  #endif
! #endif
  
    /* This hook is used by edebug.  */
    if (! NILP (Vsignal_hook_function)
***************
*** 1512,1524 ****
    for (; handlerlist; handlerlist = handlerlist->next)
      {
        register Lisp_Object clause;
!       
        if (lisp_eval_depth + 20 > max_lisp_eval_depth)
        max_lisp_eval_depth = lisp_eval_depth + 20;
!   
        if (specpdl_size + 40 > max_specpdl_size)
        max_specpdl_size = specpdl_size + 40;
!   
        clause = find_handler_clause (handlerlist->handler, conditions,
                                    error_symbol, data, &debugger_value);
  
--- 1512,1524 ----
    for (; handlerlist; handlerlist = handlerlist->next)
      {
        register Lisp_Object clause;
! 
        if (lisp_eval_depth + 20 > max_lisp_eval_depth)
        max_lisp_eval_depth = lisp_eval_depth + 20;
! 
        if (specpdl_size + 40 > max_specpdl_size)
        max_specpdl_size = specpdl_size + 40;
! 
        clause = find_handler_clause (handlerlist->handler, conditions,
                                    error_symbol, data, &debugger_value);
  
***************
*** 1608,1614 ****
              error_message = Ferror_message_string (data);
              first_string = 0;
            }
!         
          if (fast_string_match (XCAR (tail), error_message) >= 0)
            return 1;
        }
--- 1608,1614 ----
              error_message = Ferror_message_string (data);
              first_string = 0;
            }
! 
          if (fast_string_match (XCAR (tail), error_message) >= 0)
            return 1;
        }
***************
*** 1933,1939 ****
  
    /* Preserve the match data.  */
    record_unwind_protect (Fset_match_data, Fmatch_data (Qnil, Qnil));
!   
    /* Value saved here is to be restored into Vautoload_queue.  */
    record_unwind_protect (un_autoload, Vautoload_queue);
    Vautoload_queue = Qt;
--- 1933,1939 ----
  
    /* Preserve the match data.  */
    record_unwind_protect (Fset_match_data, Fmatch_data (Qnil, Qnil));
! 
    /* Value saved here is to be restored into Vautoload_queue.  */
    record_unwind_protect (un_autoload, Vautoload_queue);
    Vautoload_queue = Qt;
***************
*** 1981,1987 ****
  
    if (handling_signal)
      abort ();
!   
    if (SYMBOLP (form))
      return Fsymbol_value (form);
    if (!CONSP (form))
--- 1981,1987 ----
  
    if (handling_signal)
      abort ();
! 
    if (SYMBOLP (form))
      return Fsymbol_value (form);
    if (!CONSP (form))
***************
*** 2162,2168 ****
  
  #ifdef HAVE_CARBON
    mac_check_for_quit_char();
! #endif  
    return val;
  }
  
--- 2162,2168 ----
  
  #ifdef HAVE_CARBON
    mac_check_for_quit_char();
! #endif
    return val;
  }
  
***************
*** 2185,2191 ****
    funcall_args = 0;
    spread_arg = args [nargs - 1];
    CHECK_LIST (spread_arg);
!   
    numargs = XINT (Flength (spread_arg));
  
    if (numargs == 0)
--- 2185,2191 ----
    funcall_args = 0;
    spread_arg = args [nargs - 1];
    CHECK_LIST (spread_arg);
! 
    numargs = XINT (Flength (spread_arg));
  
    if (numargs == 0)
***************
*** 2280,2286 ****
  
    return Qnil;
  }
!       
  DEFUN ("run-hook-with-args", Frun_hook_with_args,
         Srun_hook_with_args, 1, MANY, 0,
         doc: /* Run HOOK with the specified arguments ARGS.
--- 2280,2286 ----
  
    return Qnil;
  }
! 
  DEFUN ("run-hook-with-args", Frun_hook_with_args,
         Srun_hook_with_args, 1, MANY, 0,
         doc: /* Run HOOK with the specified arguments ARGS.
***************
*** 2523,2529 ****
  {
    struct gcpro gcpro1;
  #ifdef NO_ARG_ARRAY
!   Lisp_Object args[2];  
  
    args[0] = fn;
    args[1] = arg1;
--- 2523,2529 ----
  {
    struct gcpro gcpro1;
  #ifdef NO_ARG_ARRAY
!   Lisp_Object args[2];
  
    args[0] = fn;
    args[1] = arg1;
***************
*** 2779,2785 ****
        default:
  
          /* If a subr takes more than 8 arguments without using MANY
!            or UNEVALLED, we need to extend this function to support it. 
             Until this is done, there is no way to call the function.  */
          abort ();
        }
--- 2779,2785 ----
        default:
  
          /* If a subr takes more than 8 arguments without using MANY
!            or UNEVALLED, we need to extend this function to support it.
             Until this is done, there is no way to call the function.  */
          abort ();
        }
***************
*** 2887,2897 ****
    for (; CONSP (syms_left); syms_left = XCDR (syms_left))
      {
        QUIT;
!       
        next = XCAR (syms_left);
        while (!SYMBOLP (next))
        next = Fsignal (Qinvalid_function, Fcons (fun, Qnil));
!       
        if (EQ (next, Qand_rest))
        rest = 1;
        else if (EQ (next, Qand_optional))
--- 2887,2897 ----
    for (; CONSP (syms_left); syms_left = XCDR (syms_left))
      {
        QUIT;
! 
        next = XCAR (syms_left);
        while (!SYMBOLP (next))
        next = Fsignal (Qinvalid_function, Fcons (fun, Qnil));
! 
        if (EQ (next, Qand_rest))
        rest = 1;
        else if (EQ (next, Qand_optional))
***************
*** 2928,2934 ****
                        AREF (fun, COMPILED_CONSTANTS),
                        AREF (fun, COMPILED_STACK_DEPTH));
      }
!   
    return unbind_to (count, val);
  }
  
--- 2928,2934 ----
                        AREF (fun, COMPILED_CONSTANTS),
                        AREF (fun, COMPILED_STACK_DEPTH));
      }
! 
    return unbind_to (count, val);
  }
  
***************
*** 3006,3012 ****
    else
      {
        Lisp_Object valcontents;
!       
        ovalue = find_symbol_value (symbol);
        specpdl_ptr->func = 0;
        specpdl_ptr->old_value = ovalue;
--- 3006,3012 ----
    else
      {
        Lisp_Object valcontents;
! 
        ovalue = find_symbol_value (symbol);
        specpdl_ptr->func = 0;
        specpdl_ptr->old_value = ovalue;
***************
*** 3020,3026 ****
          Lisp_Object where, current_buffer;
  
          current_buffer = Fcurrent_buffer ();
!         
          /* For a local variable, record both the symbol and which
             buffer's or frame's value we are saving.  */
          if (!NILP (Flocal_variable_p (symbol, Qnil)))
--- 3020,3026 ----
          Lisp_Object where, current_buffer;
  
          current_buffer = Fcurrent_buffer ();
! 
          /* For a local variable, record both the symbol and which
             buffer's or frame's value we are saving.  */
          if (!NILP (Flocal_variable_p (symbol, Qnil)))
***************
*** 3112,3118 ****
            Fset_default (symbol, specpdl_ptr->old_value);
          else if (BUFFERP (where))
            set_internal (symbol, specpdl_ptr->old_value, XBUFFER (where), 1);
!         else 
            set_internal (symbol, specpdl_ptr->old_value, NULL, 1);
        }
        else
--- 3112,3118 ----
            Fset_default (symbol, specpdl_ptr->old_value);
          else if (BUFFERP (where))
            set_internal (symbol, specpdl_ptr->old_value, XBUFFER (where), 1);
!         else
            set_internal (symbol, specpdl_ptr->old_value, NULL, 1);
        }
        else
***************
*** 3126,3132 ****
            set_internal (specpdl_ptr->symbol, specpdl_ptr->old_value, 0, 1);
        }
      }
!   
    if (NILP (Vquit_flag) && quitf)
      Vquit_flag = Qt;
  
--- 3126,3132 ----
            set_internal (specpdl_ptr->symbol, specpdl_ptr->old_value, 0, 1);
        }
      }
! 
    if (NILP (Vquit_flag) && quitf)
      Vquit_flag = Qt;
  
***************
*** 3300,3306 ****
  
    Qdeclare = intern ("declare");
    staticpro (&Qdeclare);
!   
    /* Note that the process handling also uses Qexit, but we don't want
       to staticpro it twice, so we just do it here.  */
    Qexit = intern ("exit");
--- 3300,3306 ----
  
    Qdeclare = intern ("declare");
    staticpro (&Qdeclare);
! 
    /* Note that the process handling also uses Qexit, but we don't want
       to staticpro it twice, so we just do it here.  */
    Qexit = intern ("exit");