From: William Harold Newman <william.newman@airmail.net>
Date: Sun, 2 Feb 2003 14:03:05 +0000 (+0000)
Subject: 0.7.12.5:
X-Git-Url: http://repo.macrolet.net/gitweb/?a=commitdiff_plain;h=42c897f39be552e99d73ad23c12e1ede2dd4c512;p=sbcl.git

0.7.12.5:
	fixed s/function/fun/ gone wild in restart logic, as per
		patch from Robert E. Brown sbcl-devel 2003-02-01
---

diff --git a/NEWS b/NEWS
index 1c984cb..86fb57a 100644
--- a/NEWS
+++ b/NEWS
@@ -1520,6 +1520,8 @@ changes in sbcl-0.7.13 relative to sbcl-0.7.12:
     the lexical environment.
   * fixed a bug in DEFCLASS: classes named by symbols with no or
     unprintable packages can now be defined.
+  * fixed a bug in RESTART-BIND: The :TEST-FUNCTION option had been
+    carelessly renamed to :TEST-FUN. (thanks to Robert E. Brown)
   * fixed some bugs revealed by Paul Dietz' test suite:
     ** ARRAY-IN-BOUNDS-P now allows arbitrary integers as arguments,
        not just nonnegative fixnums;
diff --git a/src/code/target-error.lisp b/src/code/target-error.lisp
index a206630..cb48233 100644
--- a/src/code/target-error.lisp
+++ b/src/code/target-error.lisp
@@ -23,10 +23,10 @@
 
 (defstruct (restart (:copier nil) (:predicate nil))
   (name (missing-arg) :type symbol :read-only t)
-  function
-  report-function
-  interactive-function
-  (test-fun (lambda (cond) (declare (ignore cond)) t)))
+  (function (missing-arg) :type function)
+  (report-function nil :type (or null function))
+  (interactive-function nil :type (or null function))
+  (test-function (lambda (cond) (declare (ignore cond)) t) :type function))
 (def!method print-object ((restart restart) stream)
   (if *print-escape*
       (print-unreadable-object (restart stream :type t :identity t)
@@ -51,7 +51,8 @@
 	  (when (and (or (not condition)
 			 (member restart associated)
 			 (not (member restart other)))
-		     (funcall (restart-test-fun restart) condition))
+		     (funcall (restart-test-function restart)
+                              condition))
 	    (res restart))))
       (res))))
 
@@ -208,7 +209,7 @@
 				   :interactive-function
 				   result)))
 	     (when test
-	       (setq result (list* `#',test :test-fun result)))
+	       (setq result (list* `#',test :test-function result)))
 	     (nreverse result)))
 	 (parse-keyword-pairs (list keys)
 	   (do ((l list (cddr l))
diff --git a/version.lisp-expr b/version.lisp-expr
index efe04d3..234f336 100644
--- a/version.lisp-expr
+++ b/version.lisp-expr
@@ -18,4 +18,4 @@
 ;;; versions, especially for internal versions off the main CVS
 ;;; branch, it gets hairier, e.g. "0.pre7.14.flaky4.13".)
 
-"0.7.12.14"
+"0.7.12.15"