HCoop
/
bpt
/
emacs.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge from emacs-24; up to 2012-12-23T02:41:17Z!rgm@gnu.org
[bpt/emacs.git]
/
src
/
eval.c
diff --git
a/src/eval.c
b/src/eval.c
index
030bf14
..
5db6f9d
100644
(file)
--- a/
src/eval.c
+++ b/
src/eval.c
@@
-1898,7
+1898,7
@@
If LEXICAL is t, evaluate using lexical scoping. */)
{
ptrdiff_t count = SPECPDL_INDEX ();
specbind (Qinternal_interpreter_environment,
{
ptrdiff_t count = SPECPDL_INDEX ();
specbind (Qinternal_interpreter_environment,
-
NILP (lexical) ? Qni
l : Fcons (Qt, Qnil));
+
CONSP (lexical) || NILP (lexical) ? lexica
l : Fcons (Qt, Qnil));
return unbind_to (count, eval_sub (form));
}
return unbind_to (count, eval_sub (form));
}