Changeset 13878


Ignore:
Timestamp:
Jun 24, 2010, 11:37:51 AM (9 years ago)
Author:
gb
Message:

%ACTIVE-RESTART: if we match a RESTART (not the name of one), don't
call the restart's test function.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/source/level-1/l1-error-system.lisp

    r13187 r13878  
    633633  (dolist (cluster %restarts%)
    634634    (dolist (restart cluster)
    635       (let* ((rname (%restart-name restart))
    636              (rtest (%restart-test restart)))
    637         (when (and (or (eq restart name) (eq rname name))
    638                    (or (null rtest) (funcall rtest nil)))
    639           (return-from %active-restart (values restart cluster))))))
     635      (when (or (eq restart name)
     636                (let* ((rname (%restart-name restart))
     637                       (rtest (%restart-test restart)))
     638                  (and (eq rname name)
     639                       (or (null rtest) (funcall rtest nil)))))
     640                (return-from %active-restart (values restart cluster)))))
    640641  (error 'inactive-restart :restart-name name))
    641642
Note: See TracChangeset for help on using the changeset viewer.