From: Stefan Monnier <monnier@iro.umontreal.ca>
Date: Tue, 1 Jun 2004 23:21:55 +0000 (+0000)
Subject: (Fcondition_case): Fix usage.  Simplify.
X-Git-Tag: ttn-vms-21-2-B4~5966
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=2b47b74d0c65aec3fa71301ee92ca8274af99959;p=emacs.git

(Fcondition_case): Fix usage.  Simplify.
---

diff --git a/src/eval.c b/src/eval.c
index 921a7533a60..e1da1def446 100644
--- a/src/eval.c
+++ b/src/eval.c
@@ -1220,7 +1220,7 @@ VAR may be nil; then you do not get access to the signal information.
 
 The value of the last BODY form is returned from the condition-case.
 See also the function `signal' for more info.
-usage: (condition-case VAR BODYFORM HANDLERS...)  */)
+usage: (condition-case VAR BODYFORM &rest HANDLERS)  */)
      (args)
      Lisp_Object args;
 {
@@ -1235,10 +1235,10 @@ usage: (condition-case VAR BODYFORM HANDLERS...)  */)
   handlers = Fcdr (Fcdr (args));
   CHECK_SYMBOL (var);
 
-  for (val = handlers; ! NILP (val); val = Fcdr (val))
+  for (val = handlers; CONSP (val); val = XCDR (val))
     {
       Lisp_Object tem;
-      tem = Fcar (val);
+      tem = XCAR (val);
       if (! (NILP (tem)
 	     || (CONSP (tem)
 		 && (SYMBOLP (XCAR (tem))