use guile conses

[bpt/emacs.git] / src / eval.c

diff --git a/src/eval.c b/src/eval.c
index 7d54ddb..985abce 100644 (file)
--- a/src/eval.c
+++ b/src/eval.c
@@ -1168,7 +1168,6 @@ unwind_to_catch (struct handler *catch, Lisp_Object value)
 
   eassert (handlerlist == catch);
 
-  byte_stack_list = catch->byte_stack;
   gcprolist = catch->gcpro;
 #ifdef DEBUG_GCPRO
   gcpro_level = gcprolist ? gcprolist->level + 1 : 0;
@@ -1478,8 +1477,7 @@ See also the function `condition-case'.  */)
   struct handler *h;
 
   immediate_quit = 0;
-  abort_on_gc = 0;
-  if (gc_in_progress || waiting_for_input)
+  if (waiting_for_input)
     emacs_abort ();
 
 #if 0 /* rms: I don't know why this was here,
@@ -1880,12 +1878,6 @@ this does nothing and returns nil.  */)
       && !AUTOLOADP (XSYMBOL (function)->function))
     return Qnil;
 
-  if (!NILP (Vpurify_flag) && EQ (docstring, make_number (0)))
-    /* `read1' in lread.c has found the docstring starting with "\
-       and assumed the docstring will be provided by Snarf-documentation, so it
-       passed us 0 instead.  But that leads to accidental sharing in purecopy's
-       hash-consing, so we use a (hopefully) unique integer instead.  */
-    docstring = make_number (XHASH (function));
   return Fdefalias (function,
                    list5 (Qautoload, file, docstring, interactive, type),
                    Qnil);
@@ -2117,8 +2109,6 @@ eval_sub (Lisp_Object form)
       args_left = original_args;
       numargs = Flength (args_left);
 
-      check_cons_list ();
-
       if (XINT (numargs) < XSUBR (fun)->min_args
          || (XSUBR (fun)->max_args >= 0
              && XSUBR (fun)->max_args < XINT (numargs)))
@@ -2256,7 +2246,6 @@ eval_sub (Lisp_Object form)
       else
        xsignal1 (Qinvalid_function, original_fun);
     }
-  check_cons_list ();
 
   lisp_eval_depth--;
   if (backtrace_debug_on_exit (specpdl_ptr - 1))
@@ -2763,8 +2752,6 @@ usage: (funcall FUNCTION &rest ARGUMENTS)  */)
   if (debug_on_next_call)
     do_debug_on_call (Qlambda);
 
-  check_cons_list ();
-
   original_fun = args[0];
 
  retry:
@@ -2872,13 +2859,11 @@ usage: (funcall FUNCTION &rest ARGUMENTS)  */)
       else if (EQ (funcar, Qautoload))
        {
          Fautoload_do_load (fun, original_fun, Qnil);
-         check_cons_list ();
          goto retry;
        }
       else
        xsignal1 (Qinvalid_function, original_fun);
     }
-  check_cons_list ();
   lisp_eval_depth--;
   if (backtrace_debug_on_exit (specpdl_ptr - 1))
     val = call_debugger (list2 (Qexit, val));
@@ -3649,41 +3634,6 @@ NFRAMES and BASE specify the activation frame to use, as in `backtrace-frame'.
 }
 
 \f
-void
-mark_specpdl (void)
-{
-  union specbinding *pdl;
-  for (pdl = specpdl; pdl != specpdl_ptr; pdl++)
-    {
-      switch (pdl->kind)
-       {
-       case SPECPDL_UNWIND:
-         mark_object (specpdl_arg (pdl));
-         break;
-
-       case SPECPDL_BACKTRACE:
-         {
-           ptrdiff_t nargs = backtrace_nargs (pdl);
-           mark_object (backtrace_function (pdl));
-           if (nargs == UNEVALLED)
-             nargs = 1;
-           while (nargs--)
-             mark_object (backtrace_args (pdl)[nargs]);
-         }
-         break;
-
-       case SPECPDL_LET_DEFAULT:
-       case SPECPDL_LET_LOCAL:
-         mark_object (specpdl_where (pdl));
-         /* Fall through.  */
-       case SPECPDL_LET:
-         mark_object (specpdl_symbol (pdl));
-         mark_object (specpdl_old_value (pdl));
-         break;
-       }
-    }
-}
-
 void
 get_backtrace (Lisp_Object array)
 {