reduce errors during GREET from out-of-order problems (#596)

greetfiles/MEDLEYDIR-INIT

@@ -1,18 +1,21 @@
 (DEFINE-FILE-INFO PACKAGE "INTERLISP" READTABLE "INTERLISP" BASE 10)
 
-
(FILECREATED "14-Nov-2021 22:34:49" {DSK}<home>larry>medley>greetfiles>MEDLEYDIR-INIT.;2
 2303   
+
(FILECREATED " 2-Dec-2021 21:13:55" {DSK}<home>larry>medley>greetfiles>MEDLEYDIR-INIT.;3
 2392   
 
       changes to%:  (VARS MEDLEYDIR-INITCOMS)
+                    (FNS INTERLISPMODE)
 
-      previous date%: "14-Nov-2021 22:10:37" {DSK}<home>larry>medley>greetfiles>medleydir-INIT.;1)
+      previous date%: "14-Nov-2021 22:34:49" {DSK}<home>larry>medley>greetfiles>MEDLEYDIR-INIT.;1)
 
 
 (PRETTYCOMPRINT MEDLEYDIR-INITCOMS)
 
 (RPAQQ MEDLEYDIR-INITCOMS

-       ((P (LOAD? (CONCAT (OR (UNIX-GETENV "MEDLEYDIR")
+       ([P (LOAD? (CONCAT (OR (UNIX-GETENV "MEDLEYDIR")
                               "")
-                         "/sources/MEDLEYDIR.LCOM")))
+                         "/sources/MEDLEYDIR.LCOM"))
+           (MEDLEY-INIT-VARS)
+           (KEYACTION 'LOCK '(LOCKTOGGLE . IGNORE]
         (FILES BACKGROUND-YIELD)
         (VARS (FILING.ENUMERATION.DEPTH 1)
               [LOGINDIR (DIRECTORYNAME (OR (UNIX-GETENV "LOGINDIR")
@@ -20,13 +23,16 @@
               [USERGREETFILES `((,LOGINDIR "INIT" COM)
                                 (,LOGINDIR "INIT"]
               (COPYRIGHTSRESERVED NIL))
-        [P (KEYACTION 'LOCK '(LOCKTOGGLE . IGNORE]
         (FNS INTERLISPMODE)))
 
 (LOAD? (CONCAT (OR (UNIX-GETENV "MEDLEYDIR")
                    "")
               "/sources/MEDLEYDIR.LCOM"))
 
+(MEDLEY-INIT-VARS)
+
+(KEYACTION 'LOCK '(LOCKTOGGLE . IGNORE))
+
 (FILESLOAD BACKGROUND-YIELD)
 
 (RPAQQ FILING.ENUMERATION.DEPTH
 1)
@@ -38,8 +44,6 @@
                            (,LOGINDIR "INIT")))
 
 (RPAQQ COPYRIGHTSRESERVED
 NIL)
-
-(KEYACTION 'LOCK '(LOCKTOGGLE . IGNORE))
 (DEFINEQ
 
 (INTERLISPMODE

@@ -56,5 +60,5 @@
                                                :PACKAGE "INTERLISP"])
 )
 (DECLARE%: DONTCOPY
-  (FILEMAP (NIL (1455 2280 (INTERLISPMODE 1465 . 2278)))))
+  (FILEMAP (NIL (1544 2369 (INTERLISPMODE 1554 . 2367)))))
 STOP

sources/MEDLEYDIR

@@ -1,26 +1,26 @@
 (DEFINE-FILE-INFO PACKAGE "INTERLISP" READTABLE "INTERLISP" BASE 10)
-
(FILECREATED "24-Aug-2021 08:30:09" {DSK}<home>larry>medley>sources>MEDLEYDIR.;10
 6764   
 
-      changes to%:  (VARS MEDLEYDIRCOMS MEDLEY-INIT-VARS)
-                    (FNS MEDLEYDIR)
+
(FILECREATED " 2-Dec-2021 20:43:35" {DSK}<home>larry>medley>sources>MEDLEYDIR.;14
 6103   
 
-      previous date%: "24-Aug-2021 07:57:05" {DSK}<home>larry>medley>sources>MEDLEYDIR.;5)
+      changes to%:  (FNS MEDLEYDIR)
+
+      previous date%: " 2-Dec-2021 20:32:45" {DSK}<home>larry>medley>sources>MEDLEYDIR.;12)
 
 
 (PRETTYCOMPRINT MEDLEYDIRCOMS)
 
-(RPAQQ MEDLEYDIRCOMS
 [
-                          (* ;; "set up initialization for file paths relative to where Medley is installed. This assumes that the environment variable MEDLEYDIR is set (usually by the ./run-medley script) to the (unix path) and all of the other directories variables are set relative to that (by MEDLEY-INIT-VARS)")

+(RPAQQ MEDLEYDIRCOMS

+       [
+        (* ;; "set up initialization for file paths relative to where Medley is installed. This assumes that the environment variable MEDLEYDIR is set (usually by the ./run-medley script) to the (unix path) and all of the other directories variables are set relative to that (by MEDLEY-INIT-VARS)")

 
-                          (FNS MEDLEY-INIT-VARS MEDLEYDIR)
-                          (INITVARS (MEDLEYDIR))
-                          (ADDVARS (BEFORESYSOUTFORMS (SETQ MEDLEYDIR))
-                                 (BEFOREMAKESYSFORMS (SETQ MEDLEYDIR))
-                                 (AFTERSYSOUTFORMS (MEDLEY-INIT-VARS))
-                                 (AFTERMAKESYSFORMS (MEDLEY-INIT-VARS)))
-                          (VARS MEDLEY-INIT-VARS)
-                          (DECLARE%: EVAL@COMPILE DOCOPY (ADDVARS (GLOBALVARS MEDLEYDIR 
-                                                                         MEDLEY-INIT-VARS])
+        (FNS MEDLEY-INIT-VARS MEDLEYDIR)
+        (INITVARS (MEDLEYDIR))
+        (ADDVARS (BEFORESYSOUTFORMS (SETQ MEDLEYDIR))
+               (BEFOREMAKESYSFORMS (SETQ MEDLEYDIR))
+               (AFTERSYSOUTFORMS (MEDLEY-INIT-VARS))
+               (AFTERMAKESYSFORMS (MEDLEY-INIT-VARS)))
+        (VARS MEDLEY-INIT-VARS)
+        (DECLARE%: EVAL@COMPILE DOCOPY (ADDVARS (GLOBALVARS MEDLEYDIR MEDLEY-INIT-VARS])
 
 
 
@@ -31,7 +31,8 @@
 (DEFINEQ
 
 (MEDLEY-INIT-VARS

-  [LAMBDA (CLEAR)
                                      (* ; "Edited 21-Aug-2021 18:23 by larry")

+  [LAMBDA (CLEAR)                                            (* ; 
+
                                                           "Edited 21-Aug-2021 18:23 by larry")

 
     (* ;; "MEDLEY-INIT-VARS has variables that might need to get reset. ")

 
@@ -61,7 +62,8 @@
             NIL])
 
 (MEDLEYDIR

-  [LAMBDA (DIRNAME FILENAME OUTPUT NOERROR)
            (* ; "Edited 14-Dec-2020 17:12 by larry")

+  [LAMBDA (DIRNAME FILENAME OUTPUT NOERROR)                  (* ; 
+
                                                           "Edited  2-Dec-2021 20:23 by kaplan")

     (DECLARE
 (GLOBALVARS MEDLEYDIR))
     (if
 (NULL DIRNAME)
         then
 (if
 (OR (NOT (BOUNDP 'MEDLEYDIR))
@@ -83,10 +85,10 @@
                 else
 (OR NOERROR (INFILEP FILENAME)
                              (ERROR "No such medley file" FILENAME)))
       else
 (OR (DIRECTORYNAME (CONCAT (MEDLEYDIR
)
-                                         DIRNAME))
-                   (IF
 NOERROR
-                       THEN
 NIL
-                     ELSE
 (ERROR "No such medley directory" DIRNAME])
+                                         DIRNAME ">"))
+                   (if
 NOERROR
+                       then
 NIL
+                     else
 (ERROR "No such medley directory" DIRNAME])
 )
 
 (RPAQ? MEDLEYDIR
 )
@@ -99,31 +101,30 @@
 
 (ADDTOVAR AFTERMAKESYSFORMS
 (MEDLEY-INIT-VARS))
 
-(RPAQQ MEDLEY-INIT-VARS
 ([LISPUSERSDIRECTORIES (MEDLEYDIR '("library" "lispusers" 
-                                                                      "internal/library" "greetfiles"
-                                                                      "docs/documentation tools"]
-                             [LISPSOURCEDIRECTORIES (MEDLEYDIR '("sources"]
-                             (LISPSOURCEDIRECTORY (CAR LISPSOURCEDIRECTORIES))
-                             (IRM.HOST&DIR (MEDLEYDIR '"docs/dinfo"))
-                             (IRM.DINFOGRAPH)
-                             (DIRECTORIES (APPEND LISPUSERSDIRECTORIES LISPSOURCEDIRECTORIES))
-                             [LOGINHOST/DIR (DIRECTORYNAME (OR (UNIX-GETENV "LOGINDIR")
-                                                               (UNIX-GETENV "HOME"]
-                             [USERGREETFILES `((,LOGINHOST/DIR "INIT" COM)
-                                               (,LOGINHOST/DIR "INIT"]
-                             (DISPLAYFONTDIRECTORIES (MEDLEYDIR '("fonts/displayfonts" 
-                                                                        "fonts/altofonts" "fonts/big"
-                                                                        "fonts/other")
-                                                            NIL NIL T))
-                             (POSTSCRIPTFONTDIRECTORIES (MEDLEYDIR '("fonts/postscriptfonts")
-                                                               NIL NIL T))
-                             (INTERPRESSFONTDIRECTORIES (MEDLEYDIR '("fonts/ipfonts")
-                                                               NIL NIL T))
-                             (XCL::*WHERE-IS-CASH-FILES*)))
+(RPAQQ MEDLEY-INIT-VARS

+       ([LISPUSERSDIRECTORIES (MEDLEYDIR '("library" "lispusers" "internal/library" "greetfiles" 
+                                                 "docs/documentation tools"]
+        [LISPSOURCEDIRECTORIES (MEDLEYDIR '("sources"]
+        (LISPSOURCEDIRECTORY (CAR LISPSOURCEDIRECTORIES))
+        (IRM.HOST&DIR (MEDLEYDIR '"docs/dinfo"))
+        (IRM.DINFOGRAPH)
+        (DIRECTORIES (APPEND LISPUSERSDIRECTORIES LISPSOURCEDIRECTORIES))
+        [LOGINHOST/DIR (DIRECTORYNAME (OR (UNIX-GETENV "LOGINDIR")
+                                          (UNIX-GETENV "HOME"]
+        [USERGREETFILES `((,LOGINHOST/DIR "INIT" COM)
+                          (,LOGINHOST/DIR "INIT"]
+        (DISPLAYFONTDIRECTORIES (MEDLEYDIR '("fonts/displayfonts" "fonts/altofonts" "fonts/big" 
+                                                   "fonts/other")
+                                       NIL NIL T))
+        (POSTSCRIPTFONTDIRECTORIES (MEDLEYDIR '("fonts/postscriptfonts")
+                                          NIL NIL T))
+        (INTERPRESSFONTDIRECTORIES (MEDLEYDIR '("fonts/ipfonts")
+                                          NIL NIL T))
+        (XCL::*WHERE-IS-CASH-FILES*)))
 (DECLARE%: EVAL@COMPILE DOCOPY 
 
 (ADDTOVAR GLOBALVARS
 MEDLEYDIR MEDLEY-INIT-VARS)
 )
 (DECLARE%: DONTCOPY
-  (FILEMAP (NIL (1665 4710 (MEDLEY-INIT-VARS 1675 . 3223) (MEDLEYDIR 3225 . 4708)))))
+  (FILEMAP (NIL (1380 4562 (MEDLEY-INIT-VARS 1390 . 3004) (MEDLEYDIR 3006 . 4560)))))
 STOP