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.

diff --git a/src/ChangeLog b/src/ChangeLog
index 5f3aa60dfd6e040a3657b72213501d38160c4392..5b9c1c7fc72cc0bbbbd3d786a561bc0785c2bb43 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,9 @@
+2011-07-04  Juanma Barranquero  <lekktu@gmail.com>
+
+       * 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.
+
 2011-07-03  Lars Magne Ingebrigtsen  <larsi@gnus.org>
 
        * callint.c (Finteractive): Clarify the meaning of "@" (bug#8813).

diff --git a/src/eval.c b/src/eval.c
index cb8b4f3ea0788d8662eba133f9496c406c66aacf..e8a3f947f9d52259c1d8c15bac65ad3e47f7c7d4 100644 (file)
--- a/src/eval.c
+++ b/src/eval.c
@@ -1640,8 +1640,7 @@ internal_condition_case_n (Lisp_Object (*bfun) (ptrdiff_t, Lisp_Object *),
 }
 
 \f
-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;