From: Christophe Rhodes <csr21@cam.ac.uk>
Date: Mon, 7 Feb 2005 12:41:42 +0000 (+0000)
Subject: 0.8.19.19:
X-Git-Url: http://repo.macrolet.net/gitweb/?a=commitdiff_plain;h=509586994aa7042df91fa716c95627151de77ee6;p=sbcl.git

0.8.19.19:
	Fix bug in WITH-INPUT-FROM-STRING (PFD ansi-tests)
	... only update INDEX on normal exit.  (Fix from Bryan O'Connor)
---

diff --git a/NEWS b/NEWS
index 0c39013..7a20686 100644
--- a/NEWS
+++ b/NEWS
@@ -40,6 +40,8 @@ changes in sbcl-0.8.20 (0.9alpha.0?) relative to sbcl-0.8.19:
        secondary constituent character trait.
     ** SET-SYNTAX-FROM-CHAR correctly copies multiple-escape character
        syntax.
+    ** WITH-INPUT-FROM-STRING should only update the index place on
+       normal termination.
 
 changes in sbcl-0.8.19 relative to sbcl-0.8.18:
   * new port: SBCL now works in native 64-bit mode on x86-64/Linux
diff --git a/src/code/macros.lisp b/src/code/macros.lisp
index 9f65732..729445a 100644
--- a/src/code/macros.lisp
+++ b/src/code/macros.lisp
@@ -369,9 +369,10 @@
 						 ,(or start 0)
 						 ,end)))))
 	 ,@decls
-	 (unwind-protect
-	     (progn ,@forms)
-	   (close ,var)
+	 (multiple-value-prog1
+	     (unwind-protect
+		  (progn ,@forms)
+	       (close ,var))
 	   ,@(when index
 	       `((setf ,index (string-input-stream-current ,var)))))))))
 
diff --git a/version.lisp-expr b/version.lisp-expr
index 8a08196..05b16af 100644
--- a/version.lisp-expr
+++ b/version.lisp-expr
@@ -17,4 +17,4 @@
 ;;; checkins which aren't released. (And occasionally for internal
 ;;; versions, especially for internal versions off the main CVS
 ;;; branch, it gets hairier, e.g. "0.pre7.14.flaky4.13".)
-"0.8.19.18"
+"0.8.19.19"