Imported Upstream version 16.7

1 files changed, 10 insertions, 10 deletions

diff --git a/s7-slib-init.scm b/s7-slib-init.scm
index ddfa3f5..be378f5 100644
--- a/s7-slib-init.scm
+++ b/s7-slib-init.scm
@@ -102,7 +102,7 @@
       (lambda (vic name)
 	(let ((L (string-length vic)))
 	  (string-append
-	   (if (or (zero? (string-length vic))
+	   (if (or (string=? vic "")
 		   (not (char=? #\] (string-ref vic (- L 1)))))
 	       (values vic "[")
 	       (values (substring vic 0 (- L 1)) "."))
@@ -334,14 +334,14 @@
     (else (slib:error 'open-file 'mode? modes))))
 (define (port? obj) (or (input-port? obj) (output-port? obj)))
 (define (call-with-open-ports . ports)
-  (define proc (car ports))
-  (cond ((procedure? proc) (set! ports (cdr ports)))
-	(else (set! ports (reverse ports))
-	      (set! proc (car ports))
-	      (set! ports (reverse (cdr ports)))))
-  (let ((ans (apply proc ports)))
-    (for-each close-port ports)
-    ans))
+  (let ((proc (car ports)))
+    (cond ((procedure? proc) (set! ports (cdr ports)))
+	  (else (set! ports (reverse ports))
+		(set! proc (car ports))
+		(set! ports (reverse (cdr ports)))))
+    (let ((ans (apply proc ports)))
+      (for-each close-port ports)
+      ans)))
 (define (close-port port)
   (cond ((input-port? port)
 	 (close-input-port port)
@@ -358,7 +358,7 @@
 
 ;;@ define these as appropriate for your system.
 (define slib:tab #\tab)
-(define slib:form-feed (integer->char 12))
+(define slib:form-feed #\xc) ;(integer->char 12))
 
 ;;@ Support for older versions of Scheme.  Not enough code for its own file.
 (define (last-pair lst) (if (pair? (cdr lst)) (last-pair (cdr lst)) lst))