Fixed edwin.ldr. Some files were loaded twice.

Changed the selection of a default display type.

If a display type is requested but is not available then an error is
generated (the code used not to check).

There is no longer a preference for the display type 'CONSOLE, so the
list of defined types is always searched.  The initialization sequence
in edwin.ldr is tterm before (xterm or win32), which puts the
graphical display types ahead of the console in the display types
list, and this places them at a higher desirability.

Doing this revealed that the win32 availablility predicate was
implemented incorrectly.

diff --git a/v7/src/edwin/edwin.ldr b/v7/src/edwin/edwin.ldr
index 3a06c81c1ef58273c4dde08cc75af3d8fe4082d2..7c0b265dbe787f57e0bc957ab8472f52e037adbc 100644 (file)
--- a/v7/src/edwin/edwin.ldr
+++ b/v7/src/edwin/edwin.ldr
@@ -1,6 +1,6 @@
 #| -*-Scheme-*-
 
-$Id: edwin.ldr,v 1.50 1994/10/25 01:46:12 adams Exp $
+$Id: edwin.ldr,v 1.51 1994/11/03 05:03:53 adams Exp $
 
 Copyright (c) 1989-94 Massachusetts Institute of Technology
 
@@ -130,27 +130,8 @@ MIT in each case. |#
          (load "modwin" environment)
          (load "buffrm" environment)
          (load "edtfrm" environment))
-       (load "calias" environment)
-       (case (lookup 'os-type)
-         ((NT)
-          (load-set-and-initialize! '("win32")
-                                    (->environment '(EDWIN SCREEN WIN32)))
-          (load-set-and-initialize! '("key-w32")
-                                    (->environment '(EDWIN WIN32-KEYS))))
-         ((UNIX)
-          (load-set-and-initialize! '("xterm")
-                                    (->environment '(EDWIN SCREEN X-SCREEN)))
-          (load-set-and-initialize! '("key-x11")
-                                    (->environment '(EDWIN X-KEYS)))))
-
-       (let ((env (->environment '(EDWIN SCREEN CONSOLE-SCREEN))))
-         (load-set-and-initialize! '("termcap" "tterm") env)
-         (if (memq (lookup 'os-type) '(dos nt))
-             (begin
-               (load "ansi" env)
-               (if (load "bios" env)
-                   ((access bios-initialize-package! env))))))
 
+       (load "calias" environment)
        (load "edtstr" environment)
        (load "editor" environment)
        (load "curren" environment)
@@ -175,34 +156,6 @@ MIT in each case. |#
 
        (load "fileio" environment)
 
-       (load-case 'os-type '((unix . "process")
-                             (dos . "dosproc")
-                             (nt . "dosproc"))
-                  (->environment '(EDWIN PROCESS)))
-
-       (load "argred" (->environment '(EDWIN COMMAND-ARGUMENT)))
-       (load "autold" environment)
-       (load "autosv" environment)
-       (load "basic" environment)
-       (load "bufcom" environment)
-       (load "bufmnu" (->environment '(EDWIN BUFFER-MENU)))
-       (load "c-mode" environment)
-       (load "cinden" (->environment '(EDWIN C-INDENTATION)))
-       (load "comhst" environment)
-       (load "comint" environment)
-       (load "compile" environment)
-       (load "dabbrev" environment)
-
-       (load "mousecom" environment)
-       (load "xcom" (->environment '(EDWIN X-COMMANDS)))
-       (if (memq (lookup 'os-type) '(NT))
-           (load-set-and-initialize! '("key-w32")
-                                     (->environment '(EDWIN WIN32-KEYS))))
-       (if (memq (lookup 'os-type) '(UNIX))
-           (load-set-and-initialize! '("key-x11")
-                                     (->environment '(EDWIN X-KEYS))))
-       
-
        (let ((env (->environment '(EDWIN SCREEN CONSOLE-SCREEN))))
          (load-set-and-initialize! '("termcap" "tterm") env)
          (if (memq (lookup 'os-type) '(dos nt))
@@ -211,35 +164,34 @@ MIT in each case. |#
                (if (load "bios" env)
                    ((access bios-initialize-package! env))))))
 
-       (load "edtstr" environment)
-       (load "editor" environment)
-       (load "curren" environment)
-       (load "simple" environment)
-       (load "debuge" environment)
-       (load "modlin" (->environment '(EDWIN MODELINE-STRING)))
-       (load "input" (->environment '(EDWIN KEYBOARD)))
-       (load "prompt" (->environment '(EDWIN PROMPT)))
-       (load "comred" (->environment '(EDWIN COMMAND-READER)))
-       (load "bufinp" (->environment '(EDWIN BUFFER-INPUT-PORT)))
-       (load "bufout" (->environment '(EDWIN BUFFER-OUTPUT-PORT)))
-       (load "winout" (->environment '(EDWIN WINDOW-OUTPUT-PORT)))
-       (load "things" environment)
-       (load "tparse" environment)
-       (load "syntax" environment)
-       (load "regexp" (->environment '(EDWIN REGULAR-EXPRESSION)))
-       (load "rgxcmp" (->environment '(EDWIN REGULAR-EXPRESSION-COMPILER)))
-       (load "linden" (->environment '(EDWIN LISP-INDENTATION)))
-
-       (load-case 'os-type '((unix . "unix") (dos . "dos") (nt . "dos"))
-                  environment)
-
-       (load "fileio" environment)
+        (case (lookup 'os-type)
+         ((NT)
+          (load-set-and-initialize! '("win32")
+                                    (->environment '(EDWIN SCREEN WIN32)))
+          (load-set-and-initialize! '("key-w32")
+                                    (->environment '(EDWIN WIN32-KEYS))))
+         ((UNIX)
+          (load-set-and-initialize! '("xterm")
+                                    (->environment '(EDWIN SCREEN X-SCREEN)))
+          (load-set-and-initialize! '("key-x11")
+                                    (->environment '(EDWIN X-KEYS)))))
 
        (load-case 'os-type '((unix . "process")
                              (dos . "dosproc")
                              (nt . "dosproc"))
                   (->environment '(EDWIN PROCESS)))
 
+       (load "mousecom" environment)
+       (load "xcom" (->environment '(EDWIN X-COMMANDS)))
+       (load "win32com" (->environment '(EDWIN WIN-COMMANDS)))
+       ;; debug depends on button1-down defined in mousecom
+       (load "debug" (->environment '(EDWIN DEBUGGER)))
+
+       (let ((env (->environment '(EDWIN DIRED))))
+         (load "dired" env)
+         (if (eq? (lookup 'os-type) 'unix)
+             (load "dirunx" env)))
+
        (load "argred" (->environment '(EDWIN COMMAND-ARGUMENT)))
        (load "autold" environment)
        (load "autosv" environment)
@@ -252,18 +204,6 @@ MIT in each case. |#
        (load "comint" environment)
        (load "compile" environment)
        (load "dabbrev" environment)
-
-       (load "mousecom" environment)
-       (load "xcom" (->environment '(EDWIN X-COMMANDS)))
-       (load "win32com" (->environment '(EDWIN WIN-COMMANDS)))
-       ;; debug depends on button1-down defined in mousecom
-       (load "debug" (->environment '(EDWIN DEBUGGER)))
-
-       (let ((env (->environment '(EDWIN DIRED))))
-         (load "dired" env)
-         (if (eq? (lookup 'os-type) 'unix)
-             (load "dirunx" env)))
-
        (load "evlcom" environment)
        (load "filcom" environment)
        (load "fill" environment)