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

[Stefan Monnier]

Index: emacs/src/eval.c
diff -c emacs/src/eval.c:1.203 emacs/src/eval.c:1.204
*** emacs/src/eval.c:1.203      Wed Feb 12 10:44:40 2003
--- emacs/src/eval.c    Thu Apr 17 18:25:43 2003
***************
*** 294,317 ****
       (args)
       Lisp_Object args;
  {
!   register Lisp_Object val;
!   Lisp_Object args_left;
    struct gcpro gcpro1;
  
!   if (NILP(args))
!     return Qnil;
! 
!   args_left = args;
!   GCPRO1 (args_left);
  
!   do
      {
!       val = Feval (Fcar (args_left));
        if (!NILP (val))
        break;
!       args_left = Fcdr (args_left);
      }
-   while (!NILP(args_left));
  
    UNGCPRO;
    return val;
--- 294,311 ----
       (args)
       Lisp_Object args;
  {
!   register Lisp_Object val = Qnil;
    struct gcpro gcpro1;
  
!   GCPRO1 (args);
  
!   while (CONSP (args))
      {
!       val = Feval (XCAR (args));
        if (!NILP (val))
        break;
!       args = XCDR (args);
      }
  
    UNGCPRO;
    return val;
***************
*** 325,348 ****
       (args)
       Lisp_Object args;
  {
!   register Lisp_Object val;
!   Lisp_Object args_left;
    struct gcpro gcpro1;
  
!   if (NILP(args))
!     return Qt;
! 
!   args_left = args;
!   GCPRO1 (args_left);
  
!   do
      {
!       val = Feval (Fcar (args_left));
        if (NILP (val))
        break;
!       args_left = Fcdr (args_left);
      }
-   while (!NILP(args_left));
  
    UNGCPRO;
    return val;
--- 319,336 ----
       (args)
       Lisp_Object args;
  {
!   register Lisp_Object val = Qt;
    struct gcpro gcpro1;
  
!   GCPRO1 (args);
  
!   while (CONSP (args))
      {
!       val = Feval (XCAR (args));
        if (NILP (val))
        break;
!       args = XCDR (args);
      }
  
    UNGCPRO;
    return val;
***************
*** 410,431 ****
       (args)
       Lisp_Object args;
  {
!   register Lisp_Object val;
!   Lisp_Object args_left;
    struct gcpro gcpro1;
  
!   if (NILP(args))
!     return Qnil;
! 
!   args_left = args;
!   GCPRO1 (args_left);
  
!   do
      {
!       val = Feval (Fcar (args_left));
!       args_left = Fcdr (args_left);
      }
-   while (!NILP(args_left));
  
    UNGCPRO;
    return val;
--- 398,413 ----
       (args)
       Lisp_Object args;
  {
!   register Lisp_Object val = Qnil;
    struct gcpro gcpro1;
  
!   GCPRO1 (args);
  
!   while (CONSP (args))
      {
!       val = Feval (XCAR (args));
!       args = XCDR (args);
      }
  
    UNGCPRO;
    return val;
***************
*** 662,668 ****
    (indent INDENT)
        Set NAME's `lisp-indent-function' property to INDENT.
  
!   (edebug DEBUG)
        Set NAME's `edebug-form-spec' property to DEBUG.  (This is
        equivalent to writing a `def-edebug-spec' for the macro.)
  usage: (defmacro NAME ARGLIST [DOCSTRING] [DECL] BODY...)  */)
--- 644,650 ----
    (indent INDENT)
        Set NAME's `lisp-indent-function' property to INDENT.
  
!   (debug DEBUG)
        Set NAME's `edebug-form-spec' property to DEBUG.  (This is
        equivalent to writing a `def-edebug-spec' for the macro.)
  usage: (defmacro NAME ARGLIST [DOCSTRING] [DECL] BODY...)  */)
***************
*** 680,687 ****
    doc = Qnil;
    if (STRINGP (Fcar (tail)))
      {
!       doc = Fcar (tail);
!       tail = Fcdr (tail);
      }
  
    while (CONSP (Fcar (tail))
--- 662,669 ----
    doc = Qnil;
    if (STRINGP (Fcar (tail)))
      {
!       doc = XCAR (tail);
!       tail = XCDR (tail);
      }
  
    while (CONSP (Fcar (tail))
***************
*** 775,783 ****
        if (NILP (tem))
        Fset_default (sym, Feval (Fcar (tail)));
        tail = Fcdr (tail);
!       if (!NILP (Fcar (tail)))
        {
-         tem = Fcar (tail);
          if (!NILP (Vpurify_flag))
            tem = Fpurecopy (tem);
          Fput (sym, Qvariable_documentation, tem);
--- 757,765 ----
        if (NILP (tem))
        Fset_default (sym, Feval (Fcar (tail)));
        tail = Fcdr (tail);
!       tem = Fcar (tail);
!       if (!NILP (tem))
        {
          if (!NILP (Vpurify_flag))
            tem = Fpurecopy (tem);
          Fput (sym, Qvariable_documentation, tem);
***************
*** 1897,1910 ****
    Vautoload_queue = oldqueue;
    while (CONSP (queue))
      {
!       first = Fcar (queue);
        second = Fcdr (first);
        first = Fcar (first);
        if (EQ (second, Qnil))
        Vfeatures = first;
        else
        Ffset (first, second);
!       queue = Fcdr (queue);
      }
    return Qnil;
  }
--- 1879,1892 ----
    Vautoload_queue = oldqueue;
    while (CONSP (queue))
      {
!       first = XCAR (queue);
        second = Fcdr (first);
        first = Fcar (first);
        if (EQ (second, Qnil))
        Vfeatures = first;
        else
        Ffset (first, second);
!       queue = XCDR (queue);
      }
    return Qnil;
  }
***************
*** 1943,1949 ****
    queue = Vautoload_queue;
    while (CONSP (queue))
      {
!       first = Fcar (queue);
        second = Fcdr (first);
        first = Fcar (first);
  
--- 1925,1931 ----
    queue = Vautoload_queue;
    while (CONSP (queue))
      {
!       first = XCAR (queue);
        second = Fcdr (first);
        first = Fcar (first);
  
***************
*** 1951,1959 ****
         may be an atom if the autoload entry was generated by a defalias
         or fset.  */
        if (CONSP (second))
!       Fput (first, Qautoload, (Fcdr (second)));
  
!       queue = Fcdr (queue);
      }
  
    /* Once loading finishes, don't undo it.  */
--- 1933,1941 ----
         may be an atom if the autoload entry was generated by a defalias
         or fset.  */
        if (CONSP (second))
!       Fput (first, Qautoload, (XCDR (second)));
  
!       queue = XCDR (queue);
      }
  
    /* Once loading finishes, don't undo it.  */
***************
*** 2179,2185 ****
    register Lisp_Object spread_arg;
    register Lisp_Object *funcall_args;
    Lisp_Object fun;
!   struct gcpro gcpro1;
  
    fun = args [0];
    funcall_args = 0;
--- 2161,2167 ----
    register Lisp_Object spread_arg;
    register Lisp_Object *funcall_args;
    Lisp_Object fun;
!   int nvars;
  
    fun = args [0];
    funcall_args = 0;
***************
*** 2219,2226 ****
                                                 * sizeof (Lisp_Object));
          for (i = numargs; i < XSUBR (fun)->max_args;)
            funcall_args[++i] = Qnil;
!         GCPRO1 (*funcall_args);
!         gcpro1.nvars = 1 + XSUBR (fun)->max_args;
        }
      }
   funcall:
--- 2201,2207 ----
                                                 * sizeof (Lisp_Object));
          for (i = numargs; i < XSUBR (fun)->max_args;)
            funcall_args[++i] = Qnil;
!         nvars = 1 + XSUBR (fun)->max_args;
        }
      }
   funcall:
***************
*** 2230,2237 ****
      {
        funcall_args = (Lisp_Object *) alloca ((1 + numargs)
                                             * sizeof (Lisp_Object));
!       GCPRO1 (*funcall_args);
!       gcpro1.nvars = 1 + numargs;
      }
  
    bcopy (args, funcall_args, nargs * sizeof (Lisp_Object));
--- 2211,2217 ----
      {
        funcall_args = (Lisp_Object *) alloca ((1 + numargs)
                                             * sizeof (Lisp_Object));
!       nvars = 1 + numargs;
      }
  
    bcopy (args, funcall_args, nargs * sizeof (Lisp_Object));
***************
*** 2244,2250 ****
        spread_arg = XCDR (spread_arg);
      }
  
!   RETURN_UNGCPRO (Ffuncall (gcpro1.nvars, funcall_args));
  }
  
  /* Run hook variables in various ways.  */
--- 2224,2230 ----
        spread_arg = XCDR (spread_arg);
      }
  
!   return Ffuncall (nvars, funcall_args);
  }
  
  /* Run hook variables in various ways.  */