diff options
| author | Tom Tromey | 2013-03-08 11:57:29 -0700 |
|---|---|---|
| committer | Tom Tromey | 2013-03-08 11:57:29 -0700 |
| commit | 71f91792e3013b397996905224f387da5cc539a9 (patch) | |
| tree | 4c3d3ba909e76deea1cdf73b73fca67a57149465 /src/eval.c | |
| parent | 6f4de085f065e11f4df3195d47479f28f5ef08ba (diff) | |
| parent | b5426561089d39f18b42bed9dbfcb531f43ed562 (diff) | |
| download | emacs-71f91792e3013b397996905224f387da5cc539a9.tar.gz emacs-71f91792e3013b397996905224f387da5cc539a9.zip | |
merge from trunk
Diffstat (limited to 'src/eval.c')
| -rw-r--r-- | src/eval.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/eval.c b/src/eval.c index 18031236c7d..6d34cd80802 100644 --- a/src/eval.c +++ b/src/eval.c | |||
| @@ -1917,7 +1917,7 @@ If LEXICAL is t, evaluate using lexical scoping. */) | |||
| 1917 | { | 1917 | { |
| 1918 | ptrdiff_t count = SPECPDL_INDEX (); | 1918 | ptrdiff_t count = SPECPDL_INDEX (); |
| 1919 | specbind (Qinternal_interpreter_environment, | 1919 | specbind (Qinternal_interpreter_environment, |
| 1920 | NILP (lexical) ? Qnil : Fcons (Qt, Qnil)); | 1920 | CONSP (lexical) || NILP (lexical) ? lexical : Fcons (Qt, Qnil)); |
| 1921 | return unbind_to (count, eval_sub (form)); | 1921 | return unbind_to (count, eval_sub (form)); |
| 1922 | } | 1922 | } |
| 1923 | 1923 | ||