Try and be more careful about propagation of lexical environment.

* src/eval.c (apply_lambda, funcall_lambda): Remove lexenv arg.
(Feval): Always eval in the empty environment.
(eval_sub): New function.  Use it for all calls to Feval that should
evaluate in the lexical environment of the caller.
Pass `closure's as is to apply_lambda.
(Ffuncall): Pass `closure's as is to funcall_lambda.
(funcall_lambda): Extract lexenv for `closure's, when applicable.
Also use lexical scoping for the &rest argument, if applicable.
* src/lisp.h (eval_sub): Declare.
* src/lread.c (readevalloop): Remove `evalfun' argument.
* src/print.c (Fwith_output_to_temp_buffer):
* src/data.c (Fsetq_default): Use eval_sub.
* lisp/emacs-lisp/bytecomp.el (byte-compile-condition-case): Use push.

1 files changed, 4 insertions, 4 deletions

diff --git a/src/bytecode.c b/src/bytecode.c
index d94b19b2d07..01fce0577b0 100644
--- a/src/bytecode.c
+++ b/src/bytecode.c
@@ -901,7 +901,7 @@ exec_byte_code (Lisp_Object bytestr, Lisp_Object vector, Lisp_Object maxdepth,
 
         case Bsave_window_excursion:
           BEFORE_POTENTIAL_GC ();
-          TOP = Fsave_window_excursion (TOP);
+          TOP = Fsave_window_excursion (TOP); /* FIXME: lexbind */
           AFTER_POTENTIAL_GC ();
           break;
 
@@ -915,13 +915,13 @@ exec_byte_code (Lisp_Object bytestr, Lisp_Object vector, Lisp_Object maxdepth,
             Lisp_Object v1;
             BEFORE_POTENTIAL_GC ();
             v1 = POP;
-            TOP = internal_catch (TOP, Feval, v1);
+            TOP = internal_catch (TOP, Feval, v1); /* FIXME: lexbind */
             AFTER_POTENTIAL_GC ();
             break;
           }
 
         case Bunwind_protect:
-          record_unwind_protect (Fprogn, POP);
+          record_unwind_protect (Fprogn, POP); /* FIXME: lexbind */
           break;
 
         case Bcondition_case:
@@ -930,7 +930,7 @@ exec_byte_code (Lisp_Object bytestr, Lisp_Object vector, Lisp_Object maxdepth,
             handlers = POP;
             body = POP;
             BEFORE_POTENTIAL_GC ();
-            TOP = internal_lisp_condition_case (TOP, body, handlers);
+            TOP = internal_lisp_condition_case (TOP, body, handlers); /* FIXME: lexbind */
             AFTER_POTENTIAL_GC ();
             break;
           }