aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--src/ChangeLog4
-rw-r--r--src/eval.c2
2 files changed, 5 insertions, 1 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index 819ccd60f72..f6595637f7a 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,7 @@
12011-04-02 Juanma Barranquero <lekktu@gmail.com>
2
3 * eval.c (unwind_to_catch) [DEBUG_GCPRO]: Remove redundant assignment.
4
12011-04-02 Jan Djärv <jan.h.d@swipnet.se> 52011-04-02 Jan Djärv <jan.h.d@swipnet.se>
2 6
3 * nsterm.m (ns_update_auto_hide_menu_bar): Only for OSX 10.6 or 7 * nsterm.m (ns_update_auto_hide_menu_bar): Only for OSX 10.6 or
diff --git a/src/eval.c b/src/eval.c
index 948c2e4d158..9b6605eed2e 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;