Merge in changes for NT.

diff --git a/v7/src/edwin/edwin.ldr b/v7/src/edwin/edwin.ldr
index 7b6b7f6e8ae553632b2f6ba32b4cee77dbb154ac..9310a4a58db20e85b85d003127c4f1038568d244 100644 (file)
--- a/v7/src/edwin/edwin.ldr
+++ b/v7/src/edwin/edwin.ldr
@@ -1,8 +1,8 @@
 #| -*-Scheme-*-
 
-$Id: edwin.ldr,v 1.41 1993/08/12 08:33:36 jawilson Exp $
+$Id: edwin.ldr,v 1.42 1993/08/22 04:48:26 gjr Exp $
 
-Copyright (c) 1989-93 Massachusetts Institute of Technology
+Copyright (c) 1989-1993 Massachusetts Institute of Technology
 
 This material was developed by the Scheme project at the Massachusetts
 Institute of Technology, Department of Electrical Engineering and
@@ -133,7 +133,7 @@ MIT in each case. |#
 
        (let ((env (->environment '(EDWIN SCREEN CONSOLE-SCREEN))))
          (load-set-and-initialize! '("termcap" "tterm") env)
-         (if (eq? (lookup 'os-type) 'dos)
+         (if (memq (lookup 'os-type) '(dos nt))
              (begin
                (load "ansi" env)
                (if (load "bios" env)
@@ -158,11 +158,14 @@ MIT in each case. |#
        (load "rgxcmp" (->environment '(EDWIN REGULAR-EXPRESSION-COMPILER)))
        (load "linden" (->environment '(EDWIN LISP-INDENTATION)))
 
-       (load-case 'os-type '((unix . "unix") (dos . "dos")) environment)
+       (load-case 'os-type '((unix . "unix") (dos . "dos") (nt . "dos"))
+                  environment)
 
        (load "fileio" environment)
 
-       (load-case 'os-type '((unix . "process") (dos . "dosproc"))
+       (load-case 'os-type '((unix . "process")
+                             (dos . "dosproc")
+                             (nt . "dosproc"))
                   (->environment '(EDWIN PROCESS)))
 
        (load "argred" (->environment '(EDWIN COMMAND-ARGUMENT)))
@@ -177,7 +180,7 @@ MIT in each case. |#
        (load "comint" environment)
        (load "compile" environment)
        (load "dabbrev" environment)
-       
+
        (load "xcom" (->environment '(EDWIN X-COMMANDS)))
        ;; debug depends on x-button1-down defined in xcom
        (load "debug" (->environment '(EDWIN DEBUGGER)))

diff --git a/v7/src/edwin/edwin.pkg b/v7/src/edwin/edwin.pkg
index 38d378bdfe7ad32bb838e167de3edd3c7cd49e56..059f00c02611ba54170ab923e40282c32092b3a4 100644 (file)
--- a/v7/src/edwin/edwin.pkg
+++ b/v7/src/edwin/edwin.pkg
@@ -1,6 +1,6 @@
 #| -*-Scheme-*-
 
-$Id: edwin.pkg,v 1.125 1993/08/12 08:35:48 jbank Exp $
+$Id: edwin.pkg,v 1.126 1993/08/22 04:48:17 gjr Exp $
 
 Copyright (c) 1989-1993 Massachusetts Institute of Technology
 
@@ -39,7 +39,7 @@ MIT in each case. |#
 (define-package (edwin)
   (file-case os-type
     ((unix) "unix")
-    ((dos)  "dos"))
+    ((dos nt)  "dos"))
   (files "utils"
         "nvector"
         "ring"
@@ -282,7 +282,7 @@ MIT in each case. |#
 (define-package (edwin screen console-screen)
   (files "termcap" "tterm")
   (file-case os-type
-    ((dos) "ansi" "bios"))
+    ((dos nt) "ansi" "bios"))
   (parent (edwin screen))
   (import (runtime primitive-io)
          channel-type=terminal?
@@ -827,13 +827,40 @@ MIT in each case. |#
          port/mark)
   (import (runtime rep)
          default/repl-eval))
+\f
+(define-package (edwin text-properties)
+  (files "txtprp")
+  (parent (edwin))
+  (export (edwin)
+         add-text-properties
+         get-property
+         get-property-at
+         group-extract-properties
+         group-reinsert-properties!
+         local-comtabs
+         next-property-change
+         next-specific-property-change
+         prev-specific-property-change
+         previous-property-change
+         remove-text-properties
+         set-text-properties
+         text-not-deleteable?
+         text-not-insertable?
+         text-properties-at
+         update-intervals-for-deletion!
+         update-intervals-for-insertion!)
+  (export (edwin window)
+         find-interval
+         interval-end
+         interval-property
+         next-interval))
 
-;;;; This is the variant used under DOS
+;;;; This is the variant used under DOS and NT (for now)
 
 #|
 (define-package (edwin process)
   (file-case os-type
-    ((dos)  "dosproc"))
+    ((dos nt)  "dosproc"))
   (parent (edwin))
   (export (edwin)
          buffer-processes                      ; always present
@@ -841,6 +868,8 @@ MIT in each case. |#
          get-buffer-process                    ; always present
          initialize-processes!                 ; always present
          process-list                          ; always present
+         process-output-available?             ; always present
+         process-status-changes?               ; always present
          subprocesses-available?))             ; always present
 
 (define-package (edwin dosjob)
@@ -854,7 +883,7 @@ MIT in each case. |#
 (define-package (edwin process)
   (file-case os-type
     ((unix) "process")
-    ((dos)  "dosproc"))
+    ((dos nt)  "dosproc"))
   (parent (edwin))
   (export (edwin)
          accept-process-output
@@ -887,7 +916,7 @@ MIT in each case. |#
          process-list                          ; always present
          process-mark
          process-name
-         process-output-available?
+         process-output-available?             ; always present
          process-runnable?
          process-send-char
          process-send-eof
@@ -895,7 +924,7 @@ MIT in each case. |#
          process-send-substring
          process-sentinel
          process-status
-         process-status-changes?
+         process-status-changes?               ; always present
          process-status-message
          quit-process
          set-process-buffer!
@@ -907,7 +936,7 @@ MIT in each case. |#
          stop-process
          subprocesses-available?               ; always present
          run-synchronous-process))
-
+\f
 (define-package (edwin screen x-screen)
   (files "xterm")
   (parent (edwin screen))
@@ -964,7 +993,7 @@ MIT in each case. |#
          x-button5-up)
   (export (edwin screen x-screen)
          update-xterm-screen-names!))
-
+\f
 (define-package (edwin keys)
   (files "key")
   (parent (edwin))
@@ -1017,7 +1046,7 @@ MIT in each case. |#
          edwin-variable$rcs-co-default-switches
          edwin-variable$rcs-diff-default-switches
          edwin-variable$rcs-log-default-switches))
-
+\f
 (define-package (edwin sendmail)
   (files "sendmail")
   (parent (edwin))
@@ -1059,7 +1088,7 @@ MIT in each case. |#
          define-mail-alias
          expand-mail-aliases
          guarantee-mail-aliases))
-
+\f
 (define-package (edwin rmail)
   (files "rmail"
         "rmailsrt"
@@ -1129,33 +1158,7 @@ MIT in each case. |#
          edwin-variable$rmail-primary-inbox-list
          edwin-variable$rmail-reply-with-re
          rmail-spool-directory))
-
-(define-package (edwin text-properties)
-  (files "txtprp")
-  (parent (edwin))
-  (export (edwin)
-         add-text-properties
-         get-property
-         get-property-at
-         group-extract-properties
-         group-reinsert-properties!
-         local-comtabs
-         next-property-change
-         next-specific-property-change
-         prev-specific-property-change
-         previous-property-change
-         remove-text-properties
-         set-text-properties
-         text-not-deleteable?
-         text-not-insertable?
-         text-properties-at
-         update-intervals-for-deletion!
-         update-intervals-for-insertion!)
-  (export (edwin window)
-         find-interval
-         interval-end
-         interval-property
-         next-interval))
+\f
 #|
 (define-package (edwin bochser)
   (files "bochser"