Re: Error in make bootstrap

[Juanma Barranquero]

On Thu, 01 May 2003 12:18:36 -0300, Vinicius Jose Latorre <address@hidden> 
wrote:

> Loading cus-start (source)...
> Wrong type argument: integerp, (0 4 3 4)

I think this patch by Stefan makes `save-match-data' (which expands to
`unwind-protect') to fail, which causes an error in cus-start.el.


Index: bytecode.c
===================================================================
RCS file: /cvsroot/emacs/emacs/src/bytecode.c,v
retrieving revision 1.74
diff -u -2 -r1.74 bytecode.c
--- bytecode.c  1 May 2003 00:22:31 -0000       1.74
+++ bytecode.c  1 May 2003 16:24:43 -0000
@@ -878,6 +878,7 @@
          /* The function record_unwind_protect can GC.  */
          BEFORE_POTENTIAL_GC ();
-         record_unwind_protect (Fprogn, POP);
+         record_unwind_protect (0, POP);
          AFTER_POTENTIAL_GC ();
+         (specpdl_ptr - 1)->symbol = Qnil;
          break;
 
Index: eval.c
===================================================================
RCS file: /cvsroot/emacs/emacs/src/eval.c,v
retrieving revision 1.207
diff -u -2 -r1.207 eval.c
--- eval.c      1 May 2003 00:40:45 -0000       1.207
+++ eval.c      1 May 2003 16:24:50 -0000
@@ -3075,4 +3075,8 @@
       if (specpdl_ptr->func != 0)
        (*specpdl_ptr->func) (specpdl_ptr->old_value);
+      /* Note that a "binding" of nil is really an unwind protect,
+        so in that case the "old value" is a list of forms to evaluate.  */
+      else if (NILP (specpdl_ptr->symbol))
+       Fprogn (specpdl_ptr->old_value);
       /* If the symbol is a list, it is really (SYMBOL WHERE
         . CURRENT-BUFFER) where WHERE is either nil, a buffer, or a


                                                           /L/e/k/t/u