aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorRichard M. Stallman1997-05-19 02:44:57 +0000
committerRichard M. Stallman1997-05-19 02:44:57 +0000
commitbe857679f65f098614295fd511978c6d1a318b1e (patch)
tree6685a8b973af2545a58871ae389f4b4be571d9b8 /src
parent4b657f72fa66caac0c66f137c04bad6b4fdd07ab (diff)
downloademacs-be857679f65f098614295fd511978c6d1a318b1e.tar.gz
emacs-be857679f65f098614295fd511978c6d1a318b1e.zip
(num_nonmacro_input_events):
Renamed from num_nonmacro_input_chars.
Diffstat (limited to 'src')
-rw-r--r--src/eval.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/src/eval.c b/src/eval.c
index eb08972bc67..50b88793004 100644
--- a/src/eval.c
+++ b/src/eval.c
@@ -145,9 +145,9 @@ Lisp_Object Vsignal_hook_function;
145 is handled by the command loop's error handler. */ 145 is handled by the command loop's error handler. */
146int debug_on_quit; 146int debug_on_quit;
147 147
148/* The value of num_nonmacro_input_chars as of the last time we 148/* The value of num_nonmacro_input_events as of the last time we
149 started to enter the debugger. If we decide to enter the debugger 149 started to enter the debugger. If we decide to enter the debugger
150 again when this is still equal to num_nonmacro_input_chars, then we 150 again when this is still equal to num_nonmacro_input_events, then we
151 know that the debugger itself has an error, and we should just 151 know that the debugger itself has an error, and we should just
152 signal the error instead of entering an infinite loop of debugger 152 signal the error instead of entering an infinite loop of debugger
153 invocations. */ 153 invocations. */
@@ -182,7 +182,7 @@ init_eval ()
182 Vquit_flag = Qnil; 182 Vquit_flag = Qnil;
183 debug_on_next_call = 0; 183 debug_on_next_call = 0;
184 lisp_eval_depth = 0; 184 lisp_eval_depth = 0;
185 /* This is less than the initial value of num_nonmacro_input_chars. */ 185 /* This is less than the initial value of num_nonmacro_input_events. */
186 when_entered_debugger = -1; 186 when_entered_debugger = -1;
187} 187}
188 188
@@ -195,7 +195,7 @@ call_debugger (arg)
195 if (specpdl_size + 40 > max_specpdl_size) 195 if (specpdl_size + 40 > max_specpdl_size)
196 max_specpdl_size = specpdl_size + 40; 196 max_specpdl_size = specpdl_size + 40;
197 debug_on_next_call = 0; 197 debug_on_next_call = 0;
198 when_entered_debugger = num_nonmacro_input_chars; 198 when_entered_debugger = num_nonmacro_input_events;
199 return apply1 (Vdebugger, arg); 199 return apply1 (Vdebugger, arg);
200} 200}
201 201
@@ -1371,7 +1371,7 @@ find_handler_clause (handlers, conditions, sig, data, debugger_value_ptr)
1371 ? debug_on_quit 1371 ? debug_on_quit
1372 : wants_debugger (Vdebug_on_error, conditions)) 1372 : wants_debugger (Vdebug_on_error, conditions))
1373 && ! skip_debugger (conditions, Fcons (sig, data)) 1373 && ! skip_debugger (conditions, Fcons (sig, data))
1374 && when_entered_debugger < num_nonmacro_input_chars) 1374 && when_entered_debugger < num_nonmacro_input_events)
1375 { 1375 {
1376 specbind (Qdebug_on_error, Qnil); 1376 specbind (Qdebug_on_error, Qnil);
1377 *debugger_value_ptr 1377 *debugger_value_ptr