aboutsummaryrefslogtreecommitdiffstats
path: root/src/data.c
diff options
context:
space:
mode:
authorStefan Monnier2010-12-13 22:37:44 -0500
committerStefan Monnier2010-12-13 22:37:44 -0500
commitdefb141157dfa37c33cdcbfa4b29c702a8fc9edf (patch)
treee0d40af60254aa9f680ce46f26c77bc47655b07f /src/data.c
parent7a600d54c026061eee6db4e499802f524e7ebe00 (diff)
downloademacs-defb141157dfa37c33cdcbfa4b29c702a8fc9edf.tar.gz
emacs-defb141157dfa37c33cdcbfa4b29c702a8fc9edf.zip
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.
Diffstat (limited to 'src/data.c')
-rw-r--r--src/data.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/data.c b/src/data.c
index 924a717cf3d..42d9e076e80 100644
--- a/src/data.c
+++ b/src/data.c
@@ -1452,7 +1452,7 @@ usage: (setq-default [VAR VALUE]...) */)
1452 1452
1453 do 1453 do
1454 { 1454 {
1455 val = Feval (Fcar (Fcdr (args_left))); 1455 val = eval_sub (Fcar (Fcdr (args_left)));
1456 symbol = XCAR (args_left); 1456 symbol = XCAR (args_left);
1457 Fset_default (symbol, val); 1457 Fset_default (symbol, val);
1458 args_left = Fcdr (XCDR (args_left)); 1458 args_left = Fcdr (XCDR (args_left));