[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] trunk r116396: * eval.c (call_debugger): When exiting the
From: |
Dmitry Antipov |
Subject: |
[Emacs-diffs] trunk r116396: * eval.c (call_debugger): When exiting the debugger, do not allow |
Date: |
Mon, 10 Feb 2014 09:48:34 +0000 |
User-agent: |
Bazaar (2.6b2) |
------------------------------------------------------------
revno: 116396
revision-id: address@hidden
parent: address@hidden
committer: Dmitry Antipov <address@hidden>
branch nick: trunk
timestamp: Mon 2014-02-10 13:48:17 +0400
message:
* eval.c (call_debugger): When exiting the debugger, do not allow
max_specpdl_size less than actual binding depth (Bug#16603).
(syms_of_eval): Adjust docstring.
modified:
src/ChangeLog changelog-20091113204419-o5vbwnq5f7feedwu-1438
src/eval.c eval.c-20091113204419-o5vbwnq5f7feedwu-237
=== modified file 'src/ChangeLog'
--- a/src/ChangeLog 2014-02-10 06:04:39 +0000
+++ b/src/ChangeLog 2014-02-10 09:48:17 +0000
@@ -8,6 +8,9 @@
* cmds.c (Fself_insert_command): Respect the width of EMACS_INT
and avoid warning.
+ * eval.c (call_debugger): When exiting the debugger, do not allow
+ max_specpdl_size less than actual binding depth (Bug#16603).
+ (syms_of_eval): Adjust docstring.
2014-02-09 Lars Ingebrigtsen <address@hidden>
=== modified file 'src/eval.c'
--- a/src/eval.c 2014-02-03 09:37:43 +0000
+++ b/src/eval.c 2014-02-10 09:48:17 +0000
@@ -283,7 +283,9 @@
bool debug_while_redisplaying;
ptrdiff_t count = SPECPDL_INDEX ();
Lisp_Object val;
- EMACS_INT old_max = max_specpdl_size, old_depth = max_lisp_eval_depth;
+ EMACS_INT old_depth = max_lisp_eval_depth;
+ /* Do not allow max_specpdl_size less than actual depth (Bug#16603). */
+ EMACS_INT old_max = max (max_specpdl_size, count);
if (lisp_eval_depth + 40 > max_lisp_eval_depth)
max_lisp_eval_depth = lisp_eval_depth + 40;
@@ -3721,7 +3723,9 @@
an error is signaled.
You can safely use a value considerably larger than the default value,
if that proves inconveniently small. However, if you increase it too far,
-Emacs could run out of memory trying to make the stack bigger. */);
+Emacs could run out of memory trying to make the stack bigger.
+Note that this limit may be silently increased by the debugger
+if `debug-on-error' or `debug-on-quit' is set. */);
DEFVAR_INT ("max-lisp-eval-depth", max_lisp_eval_depth,
doc: /* Limit on depth in `eval', `apply' and `funcall' before
error.
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] trunk r116396: * eval.c (call_debugger): When exiting the debugger, do not allow,
Dmitry Antipov <=