diff options
| author | Richard M. Stallman <rms@gnu.org> | 1992-06-10 02:25:55 +0000 |
|---|---|---|
| committer | Richard M. Stallman <rms@gnu.org> | 1992-06-10 02:25:55 +0000 |
| commit | 4de86b16296516788a3c65d98b13464c4462549a (patch) | |
| tree | cb69054474496cc057fcc84f4b4e46a2eb1060ee | |
| parent | 87ef29fd4c779b40f56cca5a5bb208c8fd79680d (diff) | |
| download | emacs-4de86b16296516788a3c65d98b13464c4462549a.tar.gz | |
*** empty log message ***
| -rw-r--r-- | src/eval.c | 10 | ||||
| -rw-r--r-- | src/lisp.h | 5 |
2 files changed, 8 insertions, 7 deletions
diff --git a/src/eval.c b/src/eval.c index f5e0bc2e276..d3d475f4d10 100644 --- a/src/eval.c +++ b/src/eval.c @@ -103,11 +103,11 @@ int max_lisp_eval_depth; int debug_on_next_call; /* List of conditions (non-nil atom means all) which cause a backtrace - if an error is handled by the command loop's error handler. + if an error is handled by the command loop's error handler. */ Lisp_Object Vstack_trace_on_error; /* List of conditions (non-nil atom means all) which enter the debugger - if an error is handled by the command loop's error handler. + if an error is handled by the command loop's error handler. */ Lisp_Object Vdebug_on_error; /* Nonzero means enter debugger if a quit signal @@ -1139,17 +1139,17 @@ wants_debugger (list, conditions) return 1; } - if (NULL (list)) + if (NILP (list)) return 0; if (! CONSP (list)) return 1; looking = 1; - while (!NULL (conditions)) + while (!NILP (conditions)) { Lisp_Object tem; tem = Fmemq (XCONS (conditions)->car, list); - if (! NULL (tem)) + if (! NILP (tem)) { looking = 0; return 1; diff --git a/src/lisp.h b/src/lisp.h index 2831070b2cd..86885456602 100644 --- a/src/lisp.h +++ b/src/lisp.h @@ -826,10 +826,11 @@ extern Lisp_Object Qinvalid_function, Qwrong_number_of_arguments, Qno_catch; extern Lisp_Object Qend_of_file, Qarith_error; extern Lisp_Object Qbeginning_of_buffer, Qend_of_buffer, Qbuffer_read_only; -extern Lisp_Object Qintegerp, Qnatnump, Qsymbolp, Qlistp, Qconsp; +extern Lisp_Object Qintegerp, Qnumberp, Qnatnump, Qsymbolp, Qlistp, Qconsp; extern Lisp_Object Qstringp, Qarrayp, Qsequencep, Qbufferp; extern Lisp_Object Qchar_or_string_p, Qmarkerp, Qvectorp; -extern Lisp_Object Qinteger_or_marker_p, Qboundp, Qfboundp; +extern Lisp_Object Qinteger_or_marker_p, Qnumber_or_marker_p; +extern Lisp_Object Qboundp, Qfboundp; extern Lisp_Object Qcdr; #ifdef LISP_FLOAT_TYPE |