Import Debian changes 3a2-3debian/3a2-3

slib (3a2-3) unstable; urgency=low

  * Brought all source files up-to-date with upstream CVS.
  Repeat changes from version 3a2-1 in Makefile.

1 files changed, 19 insertions, 20 deletions

diff --git a/jscheme.init b/jscheme.init
index 88c1623..95caa8d 100644
--- a/jscheme.init
+++ b/jscheme.init
@@ -21,11 +21,10 @@
 
 ;;@ (software-type) should be set to the generic operating system type.
 ;;; UNIX, VMS, MACOS, AMIGA and MS-DOS are supported.
-;; (define (software-type) 'UNIX)
 (define (software-type)
   (if (.startsWith (System.getProperty "os.name") "Windows")
-      'MS-DOS
-      'UNIX))
+      'ms-dos
+      'unix))
 
 ;;@ (scheme-implementation-type) should return the name of the scheme
 ;;; implementation loading this file.
@@ -45,7 +44,7 @@
 ;;; implementation reside.
 (define implementation-vicinity
   (let ((implvic (case (software-type)
-		   ((MS-DOS)	"C:\\TEMP\\")
+		   ((ms-dos)	"C:\\TEMP\\")
 		   (else "/tmp/"))))
     (lambda () implvic)))
 
@@ -72,9 +71,9 @@
 	  ;; Use this path if your scheme does not support GETENV
 	  ;; or if SCHEME_LIBRARY_PATH is not set.
 	  (case (software-type)
-	    ((UNIX) "/usr/local/lib/slib/")
-	    ((VMS) "lib$scheme:")
-	    ((MS-DOS) "C:\\SLIB\\")
+	    ((unix) "/usr/local/lib/slib/")
+	    ((vms) "lib$scheme:")
+	    ((ms-dos) "C:\\SLIB\\")
 	    (else "")))))
     (lambda () library-path)))
 
@@ -85,7 +84,7 @@
   (define home (or (getenv "HOME") (getenv "user.home")))
   (and home
        (case (software-type)
-	 ((UNIX COHERENT MS-DOS)	;V7 unix has a / on HOME
+	 ((unix coherent ms-dos)	;V7 unix has a / on HOME
 	  (if (eqv? #\/ (string-ref home (+ -1 (string-length home))))
 	      home
 	      (string-append home "/")))
@@ -95,7 +94,7 @@
 ;@
 (define (user-vicinity)
   (case (software-type)
-    ((VMS)	"[.]")
+    ((vms)	"[.]")
     (else	"")))
 
 (define *load-pathname* #f)
@@ -103,12 +102,12 @@
 (define vicinity:suffix?
   (let ((suffi
 	 (case (software-type)
-	   ((AMIGA)				'(#\: #\/))
-	   ((MACOS THINKC)			'(#\:))
-	   ((MS-DOS WINDOWS ATARIST OS/2)	'(#\\ #\/))
-	   ((NOSVE)				'(#\: #\.))
-	   ((UNIX COHERENT PLAN9)		'(#\/))
-	   ((VMS)				'(#\: #\]))
+	   ((amiga)				'(#\: #\/))
+	   ((macos thinkc)			'(#\:))
+	   ((ms-dos windows atarist os/2)	'(#\\ #\/))
+	   ((nosve)				'(#\: #\.))
+	   ((unix coherent plan9)		'(#\/))
+	   ((vms)				'(#\: #\]))
 	   (else
 	    (slib:warn "require.scm" 'unknown 'software-type (software-type))
 	    "/"))))
@@ -127,7 +126,7 @@
 ;@
 (define sub-vicinity
   (case (software-type)
-    ((VMS) (lambda
+    ((vms) (lambda
 	       (vic name)
 	     (let ((l (string-length vic)))
 	       (if (or (zero? (string-length vic))
@@ -137,10 +136,10 @@
 				  "." name "]")))))
     (else (let ((*vicinity-suffix*
 		 (case (software-type)
-		   ((NOSVE) ".")
-		   ((MACOS THINKC) ":")
-		   ((MS-DOS WINDOWS ATARIST OS/2) "\\")
-		   ((UNIX COHERENT PLAN9 AMIGA) "/"))))
+		   ((nosve) ".")
+		   ((macos thinkc) ":")
+		   ((ms-dos windows atarist os/2) "\\")
+		   ((unix coherent plan9 amiga) "/"))))
 	    (lambda (vic name)
 	      (string-append vic name *vicinity-suffix*))))))
 ;@