Changeset 410

Timestamp:

Jan 26, 2004, 4:06:46 AM (21 years ago)

Author:

Gary Byers

Message:

Bryan O'Connor's fix to %ACTIVE-RESTART.

File:

• trunk/ccl/level-1/l1-error-system.lisp (modified) (1 diff)

trunk/ccl/level-1/l1-error-system.lisp

@@ -483 +483 @@
   (dolist (cluster %restarts%)
     (dolist (restart cluster)
-      (when (or (eq restart name) (eq (%restart-name restart) name))
-        (return-from %active-restart (values restart cluster)))))
+      (let* ((rname (%restart-name restart))
+             (rtest (%restart-test restart)))
+        (when (and (or (eq restart name) (eq rname name))
+                   (or (null rtest) (funcall rtest nil)))
+          (return-from %active-restart (values restart cluster))))))
   (error 'inactive-restart :restart-name name))