...

original commit: 2bef562c4858d01bfed290f252f5a0a9323b48d1

collects/framework/prefs.ss

@@ -240,29 +240,31 @@
 		       (call-with-input-file prefs-file:preferences-filename
 			 read
 			 'text))])
-	  (let loop ([input input])
-	    (cond
-	     [(pair? input)
-	      (let ([err-msg
-		     (let/ec k
-		       (let ([first (car input)])
-			 (unless (pair? first)
-			   (k "expected pair of pair"))
-			 (let ([arg1 (car first)]
-			       [t1 (cdr first)])
-			   (unless (pair? t1)
-			     (k "expected pair of two pairs"))
-			   (let ([arg2 (car t1)]
-				 [t2 (cdr t1)])
-			     (unless (null? t2)
-			       (k "expected null after two pairs"))
-			     (parse-pref arg1 arg2)
-			     (k #f)))))])
-		(when err-msg
-		  (err input err-msg)))
-	      (loop (cdr input))]
-	     [(null? input) (void)]
-	     [else (err input "expected a pair")]))))))
+	  (if (eof-object? input)
+	      (void)
+	      (let loop ([input input])
+		(cond
+		 [(pair? input)
+		  (let ([err-msg
+			 (let/ec k
+			   (let ([first (car input)])
+			     (unless (pair? first)
+			       (k "expected pair of pair"))
+			     (let ([arg1 (car first)]
+				   [t1 (cdr first)])
+			       (unless (pair? t1)
+				 (k "expected pair of two pairs"))
+			       (let ([arg2 (car t1)]
+				     [t2 (cdr t1)])
+				 (unless (null? t2)
+				   (k "expected null after two pairs"))
+				 (parse-pref arg1 arg2)
+				 (k #f)))))])
+		    (when err-msg
+		      (err input err-msg)))
+		  (loop (cdr input))]
+		 [(null? input) (void)]
+		 [else (err input "expected a pair")])))))))
   
   ;; read-from-file-to-ht : string hash-table -> void
   (define (read-from-file-to-ht filename ht)

collects/mzlib/traceld.ss

@@ -1,2 +0,0 @@
-
-(invoke-unit/sig (require-relative-library "traceldr.ss"))

collects/slatex/slatex-code/defaults.scm

@@ -136,4 +136,4 @@
   (defvar slatex::*latex?* #t)
   (defvar slatex::*slatex-separate-includes?* #f)
   (defvar slatex::*tex-calling-directory* "")
-  )
+  )

collects/tests/framework/load.ss

@@ -72,6 +72,30 @@
       (global-defined-value 'test:run-one)
       (global-defined-value 'test:button-push)
       (void)))
+
+  (test
+   'frameworkp.ss
+   pred
+   '(parameterize ([current-namespace (make-namespace 'mred)])
+      (require-library "frameworks.ss" "framework")
+      (require-library "file.ss")
+      (eval
+       '(define-values/invoke-unit/sig
+	  framework^
+	  (compound-unit/sig
+	    (import)
+	    (link [mred : mred^ (mred@)]
+		  [core : mzlib:core^ ((require-library "corer.ss"))]
+		  [pf : framework:prefs-file^
+		      ((let ([tf (make-temporary-file)])
+			 (unit/sig framework:prefs-file^ (import)
+				   (define preferences-filename tf))))]
+		  [framework : framework^ ((require-library "frameworkp.ss" "framework")
+					   core mred pf)])
+	    (export (open framework)))))
+      (global-defined-value 'preferences:get)
+      (void)))
+
   (test
    'frameworkr.ss
    pred

readme-mac

@@ -0,0 +1 @@
+This is the PLT software package folder for MacOS.

IMPORTANT:
 After unpacking this distribution, run the Setup PLT application in
 the plt folder.


Applications
------------

The following are the applications:

  DrScheme -- the Scheme development environment

  DrScheme Jr -- a text-only version of DrScheme
  MzScheme -- a text-only Scheme interpreter
  MrEd -- a graphical Scheme interpreter
  mzc -- a Scheme compiler
  Help Desk --- for Help (also built into DrScheme)

DrScheme relies on MrEd (i.e., the DrScheme application launches
MrEd with special startup instructions), and DrScheme Jr and mzc rely
on MzScheme. You may not have some of these applications, depending
on which distribution you downloaded.


Compiling
---------

If you downloaded the source code distribution instead of the standard
distribution, you must compile MzScheme and MrEd before using the PLT
software (including DrScheme). 

For compilation instructions, unpack the Compactor archive
plt:src:cw.sit.hqx, producing plt:src:cw. Read the README file in
plt:src:cw.

If there is no plt:src:mzscheme folder, you did not download
the source code distribution. In that case, you should be ready to
run.


License
-------

PLT Software
Copyright (c) 1995-99 PLT

PLT software is distributed under the GNU Library General Public
License (LGPL).  This means you can link PLT software (such as
MzScheme or MrEd) into proprietary applications, provided you follow
the specific rules stated in the LGPL.  You can also modify PLT
software; if you distribute a modified version, you must distribute it
under the terms of the LGPL, which in particular means that you must
release the source code for the modified software. See
notes/COPYING.LIB for more information.


More Information
----------------

For further information, select `Help Desk' from DrScheme's `Help'
menu, or run Help Desk.

src/mzscheme/src/network.c

@@ -58,10 +58,6 @@ static int mzerrno = 0;
 #endif
 #include "schfd.h"
 
-#if defined(USE_UNIX_SOCKETS_TCP) || defined(USE_WINSOCK_TCP)
-# define USE_SOCKETS_TCP
-#endif
-
 #ifdef USE_MAC_TCP
 # include <MacTCP.h>
 # include <dnr.c>

src/mzscheme/src/schpriv.h

@@ -1373,6 +1373,10 @@ Scheme_Object *scheme_default_load_extension(int argc, Scheme_Object **argv);
 # define USE_TCP
 #endif
 
+#if defined(USE_UNIX_SOCKETS_TCP) || defined(USE_WINSOCK_TCP)
+# define USE_SOCKETS_TCP
+#endif
+
 extern int scheme_active_but_sleeping;
 extern int scheme_internal_checking_char;
 extern int scheme_file_open_count;