Change definition of DOS/DEFAULT-SHELL-FILE-NAME so that it is

computed at run time rather than at build time.  This is necessary
because a band created on Windows NT can be used on Windows 95, and
must have different values for each of these systems.

diff --git a/v7/src/edwin/dos.scm b/v7/src/edwin/dos.scm
index 0ca5806cb6a914a39329129419d9fb3f5f8e7879..acd0ddb34a81a2d1f2707e08f3db711e124f9cd2 100644 (file)
--- a/v7/src/edwin/dos.scm
+++ b/v7/src/edwin/dos.scm
@@ -1,6 +1,6 @@
 ;;; -*-Scheme-*-
 ;;;
-;;;    $Id: dos.scm,v 1.45 1997/10/26 01:35:43 cph Exp $
+;;;    $Id: dos.scm,v 1.46 1997/12/30 21:19:30 cph Exp $
 ;;;
 ;;;    Copyright (c) 1992-97 Massachusetts Institute of Technology
 ;;;
@@ -46,7 +46,7 @@
 
 (declare (usual-integrations))
 \f
-(define dos/windows-type
+(define (dos/windows-type)
   (cond ((string-prefix? "Microsoft Windows NT"
                         microcode-id/operating-system-variant)
         'WINNT)
@@ -58,8 +58,8 @@
         'WIN31)
        (else #f)))
 
-(define dos/default-shell-file-name
-  (if (eq? 'WINNT dos/windows-type)
+(define (dos/default-shell-file-name)
+  (if (eq? 'WINNT (dos/windows-type))
       "cmd.exe"
       "command.com"))
 

diff --git a/v7/src/edwin/dosfile.scm b/v7/src/edwin/dosfile.scm
index 3af280ae4a59fff4df0b5b3d109dba294ede2501..a0bf91c3577ccefd7d1ba95d9772c3cebc9bc8d1 100644 (file)
--- a/v7/src/edwin/dosfile.scm
+++ b/v7/src/edwin/dosfile.scm
@@ -1,6 +1,6 @@
 ;;; -*-Scheme-*-
 ;;;
-;;;    $Id: dosfile.scm,v 1.13 1997/11/01 07:33:44 cph Exp $
+;;;    $Id: dosfile.scm,v 1.14 1997/12/30 21:19:24 cph Exp $
 ;;;
 ;;;    Copyright (c) 1994-97 Massachusetts Institute of Technology
 ;;;
@@ -516,7 +516,7 @@ Switches may be concatenated, e.g. `-lt' is equivalent to `-l -t'."
 (define (os/shell-file-name)
   (or (get-environment-variable "SHELL")
       (get-environment-variable "COMSPEC")
-      dos/default-shell-file-name))
+      (dos/default-shell-file-name)))
 
 (define (os/shell-name pathname)
   (if (member (pathname-type pathname) dos/executable-pathname-types)

diff --git a/v7/src/edwin/os2.scm b/v7/src/edwin/os2.scm
index be0f3c1ffe987210efb10f665a99397ad2338072..19ad4a78c84754cd86143d0f0a0e9f5a1a7cf002 100644 (file)
--- a/v7/src/edwin/os2.scm
+++ b/v7/src/edwin/os2.scm
@@ -1,6 +1,6 @@
 ;;; -*-Scheme-*-
 ;;;
-;;;    $Id: os2.scm,v 1.41 1997/10/26 01:35:52 cph Exp $
+;;;    $Id: os2.scm,v 1.42 1997/12/30 21:19:19 cph Exp $
 ;;;
 ;;;    Copyright (c) 1994-97 Massachusetts Institute of Technology
 ;;;
@@ -45,7 +45,7 @@
 
 (declare (usual-integrations))
 \f
-(define dos/default-shell-file-name
+(define (dos/default-shell-file-name)
   "cmd.exe")
 
 (define (os/set-file-modes-writable! pathname)