diff options
| author | Paul Eggert | 2011-04-04 23:45:27 -0700 |
|---|---|---|
| committer | Paul Eggert | 2011-04-04 23:45:27 -0700 |
| commit | ca23cc8840efb1354ebe16c6bb99bf1f8880e9b6 (patch) | |
| tree | e95220daac6b9ffb47966df747308a11c0623179 /src/eval.c | |
| parent | d5efd1d1b54595db795d6fddb32404cc74923d77 (diff) | |
| parent | b87a82007428428e2f24af64a59799402bb1651e (diff) | |
| download | emacs-ca23cc8840efb1354ebe16c6bb99bf1f8880e9b6.tar.gz emacs-ca23cc8840efb1354ebe16c6bb99bf1f8880e9b6.zip | |
Merge from mainline.
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 25afe7677f7..d1a63a76767 100644 --- a/src/eval.c +++ b/src/eval.c | |||
| @@ -1297,7 +1297,7 @@ unwind_to_catch (struct catchtag *catch, Lisp_Object value) | |||
| 1297 | byte_stack_list = catch->byte_stack; | 1297 | byte_stack_list = catch->byte_stack; |
| 1298 | gcprolist = catch->gcpro; | 1298 | gcprolist = catch->gcpro; |
| 1299 | #ifdef DEBUG_GCPRO | 1299 | #ifdef DEBUG_GCPRO |
| 1300 | gcpro_level = gcprolist ? gcprolist->level + 1 : gcpro_level = 0; | 1300 | gcpro_level = gcprolist ? gcprolist->level + 1 : 0; |
| 1301 | #endif | 1301 | #endif |
| 1302 | backtrace_list = catch->backlist; | 1302 | backtrace_list = catch->backlist; |
| 1303 | lisp_eval_depth = catch->lisp_eval_depth; | 1303 | lisp_eval_depth = catch->lisp_eval_depth; |