aboutsummaryrefslogtreecommitdiffstats
path: root/src/eval.c
diff options
context:
space:
mode:
authorRichard M. Stallman1996-10-14 23:39:54 +0000
committerRichard M. Stallman1996-10-14 23:39:54 +0000
commit57a6e758e20875fa0301c3ae0ec033aeb890f7f8 (patch)
treebea742b005a512ea1daa4d835047da8918c17eb4 /src/eval.c
parent2d2972d83ce957bfd15afabcd6fb297f1fd30f41 (diff)
downloademacs-57a6e758e20875fa0301c3ae0ec033aeb890f7f8.tar.gz
emacs-57a6e758e20875fa0301c3ae0ec033aeb890f7f8.zip
(Vdebug_on_signal): Renamed from Vdebug_force.
Diffstat (limited to 'src/eval.c')
-rw-r--r--src/eval.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/src/eval.c b/src/eval.c
index 2772d197e55..069608b906b 100644
--- a/src/eval.c
+++ b/src/eval.c
@@ -136,7 +136,7 @@ Lisp_Object Vdebug_on_error;
136Lisp_Object Vdebug_ignored_errors; 136Lisp_Object Vdebug_ignored_errors;
137 137
138/* Non-nil means call the debugger even if the error will be handled. */ 138/* Non-nil means call the debugger even if the error will be handled. */
139Lisp_Object Vdebug_force; 139Lisp_Object Vdebug_on_signal;
140 140
141/* Hook for edebug to use. */ 141/* Hook for edebug to use. */
142Lisp_Object Vsignal_hook_function; 142Lisp_Object Vsignal_hook_function;
@@ -1348,8 +1348,8 @@ find_handler_clause (handlers, conditions, sig, data, debugger_value_ptr)
1348 /* error is used similarly, but means print an error message 1348 /* error is used similarly, but means print an error message
1349 and run the debugger if that is enabled. */ 1349 and run the debugger if that is enabled. */
1350 if (EQ (handlers, Qerror) 1350 if (EQ (handlers, Qerror)
1351 || !NILP (Vdebug_force)) /* This says call debugger even if 1351 || !NILP (Vdebug_on_signal)) /* This says call debugger even if
1352 there is a handler. */ 1352 there is a handler. */
1353 { 1353 {
1354 int count = specpdl_ptr - specpdl; 1354 int count = specpdl_ptr - specpdl;
1355 int debugger_called = 0; 1355 int debugger_called = 0;
@@ -2957,11 +2957,11 @@ The Edebug package uses this to regain control.");
2957 "While in a mocklisp function, the list of its unevaluated args."); 2957 "While in a mocklisp function, the list of its unevaluated args.");
2958 Vmocklisp_arguments = Qt; 2958 Vmocklisp_arguments = Qt;
2959 2959
2960 DEFVAR_LISP ("debug-force", &Vdebug_force, 2960 DEFVAR_LISP ("debug-on-signal", &Vdebug_on_signal,
2961 "*Non-nil means call the debugger regardless of condition handlers.\n\ 2961 "*Non-nil means call the debugger regardless of condition handlers.\n\
2962Note that `debug-on-error', `debug-on-quit' and friends\n\ 2962Note that `debug-on-error', `debug-on-quit' and friends\n\
2963still determine whether to handle the particular condition."); 2963still determine whether to handle the particular condition.");
2964 Vdebug_force = Qnil; 2964 Vdebug_on_signal = Qnil;
2965 2965
2966 Vrun_hooks = intern ("run-hooks"); 2966 Vrun_hooks = intern ("run-hooks");
2967 staticpro (&Vrun_hooks); 2967 staticpro (&Vrun_hooks);