summaryrefslogtreecommitdiff
path: root/src/eval.c
diff options
context:
space:
mode:
authorJuanma Barranquero <lekktu@gmail.com>2011-07-04 04:14:42 +0200
committerJuanma Barranquero <lekktu@gmail.com>2011-07-04 04:14:42 +0200
commit7d47b580380358da3353e4f379f2313ec3411af1 (patch)
tree1e60163b5f7a896d52fffd930ee8fe97c388f80f /src/eval.c
parent30b0f2501c5d2ed922a9935cdc239eab1f657ba7 (diff)
downloademacs-7d47b580380358da3353e4f379f2313ec3411af1.tar.gz
src/eval.c (find_handler_clause): Remove unused parameters.
* eval.c (find_handler_clause): Remove parameters `sig' and `data', unused since 2011-01-26T20:02:07Z!monnier@iro.umontreal.ca. All callers changed. Also (re)move comments that are misplaced or no longer relevant.
Diffstat (limited to 'src/eval.c')
-rw-r--r--src/eval.c25
1 files changed, 7 insertions, 18 deletions
diff --git a/src/eval.c b/src/eval.c
index cb8b4f3ea07..e8a3f947f9d 100644
--- a/src/eval.c
+++ b/src/eval.c
@@ -1640,8 +1640,7 @@ internal_condition_case_n (Lisp_Object (*bfun) (ptrdiff_t, Lisp_Object *),
}
-static Lisp_Object find_handler_clause (Lisp_Object, Lisp_Object,
- Lisp_Object, Lisp_Object);
+static Lisp_Object find_handler_clause (Lisp_Object, Lisp_Object);
static int maybe_call_debugger (Lisp_Object conditions, Lisp_Object sig,
Lisp_Object data);
@@ -1717,8 +1716,7 @@ See also the function `condition-case'. */)
for (h = handlerlist; h; h = h->next)
{
- clause = find_handler_clause (h->handler, conditions,
- error_symbol, data);
+ clause = find_handler_clause (h->handler, conditions);
if (!NILP (clause))
break;
}
@@ -1889,8 +1887,10 @@ skip_debugger (Lisp_Object conditions, Lisp_Object data)
}
/* Call the debugger if calling it is currently enabled for CONDITIONS.
- SIG and DATA describe the signal, as in find_handler_clause. */
-
+ SIG and DATA describe the signal. There are two ways to pass them:
+ = SIG is the error symbol, and DATA is the rest of the data.
+ = SIG is nil, and DATA is (SYMBOL . REST-OF-DATA).
+ This is for memory-full errors only. */
static int
maybe_call_debugger (Lisp_Object conditions, Lisp_Object sig, Lisp_Object data)
{
@@ -1917,19 +1917,8 @@ maybe_call_debugger (Lisp_Object conditions, Lisp_Object sig, Lisp_Object data)
return 0;
}
-/* Value of Qlambda means we have called debugger and user has continued.
- There are two ways to pass SIG and DATA:
- = SIG is the error symbol, and DATA is the rest of the data.
- = SIG is nil, and DATA is (SYMBOL . REST-OF-DATA).
- This is for memory-full errors only.
-
- We need to increase max_specpdl_size temporarily around
- anything we do that can push on the specpdl, so as not to get
- a second error here in case we're handling specpdl overflow. */
-
static Lisp_Object
-find_handler_clause (Lisp_Object handlers, Lisp_Object conditions,
- Lisp_Object sig, Lisp_Object data)
+find_handler_clause (Lisp_Object handlers, Lisp_Object conditions)
{
register Lisp_Object h;