Re: lexical mumblings

[Miles Bader]

Here's a small fix to my previous patch, BTW:

diff -c src/eval.c.\~7\~ src/eval.c
*** src/eval.c.~7~      Fri Nov  2 09:34:38 2001
--- src/eval.c  Fri Nov  2 13:41:52 2001
***************
*** 2184,2190 ****
        }
      }
    if (COMPILEDP (fun))
!     val = apply_lambda (fun, original_args, 1, Vinterpreter_lexenv);
    else
      {
        if (!CONSP (fun))
--- 2184,2190 ----
        }
      }
    if (COMPILEDP (fun))
!     val = apply_lambda (fun, original_args, 1, Qnil);
    else
      {
        if (!CONSP (fun))
***************
*** 2200,2206 ****
        if (EQ (funcar, Qmacro))
        val = Feval (apply1 (Fcdr (fun), original_args));
        else if (EQ (funcar, Qlambda))
!       val = apply_lambda (fun, original_args, 1, Vinterpreter_lexenv);
        else if (EQ (funcar, Qclosure)
               && CONSP (XCDR (fun))
               && CONSP (XCDR (XCDR (fun)))
--- 2200,2209 ----
        if (EQ (funcar, Qmacro))
        val = Feval (apply1 (Fcdr (fun), original_args));
        else if (EQ (funcar, Qlambda))
!       val = apply_lambda (fun, original_args, 1,
!                           /* Only pass down the current lexical environment
!                              if FUN is lexically embedded in FORM.  */
!                           CONSP (original_fun) ? Vinterpreter_lexenv : Qnil);
        else if (EQ (funcar, Qclosure)
               && CONSP (XCDR (fun))
               && CONSP (XCDR (XCDR (fun)))

-Miles
-- 
"1971 pickup truck; will trade for guns"