From 9d09033cc4216115a2a6ec815324a3e3cd36fe9e Mon Sep 17 00:00:00 2001
From: Frank Halasz <frank@halasz.org>
Date: Sat, 26 Nov 2022 11:46:41 -0800
Subject: [PATCH] Fix to Issue#1022 "Error during greet" (#1027)

* Fix to Issue#1022 Error during greet

* More fix to Issue#1022.  Turns out need to reset MEDLEYDIR for AFTERMAKESYS as well as at greet time.  Discovered during loadup-online.sh with no greet file.

* Removing AFTERMAKESYS event action from (MEDLEY-INIT-VARS).  Cleaning up a bit the GREET event action in (MEDLEY-INIT-VARS).  Remove issue with MEDLEY-INIT-VARS being called after the user greet file in the AFTERMAKESYS case.
---
 greetfiles/MEDLEYDIR-INIT      |  50 +++++----------------------------
 greetfiles/MEDLEYDIR-INIT.LCOM | Bin 2968 -> 2186 bytes
 sources/MEDLEYDIR              |  26 +++++++++++------
 sources/MEDLEYDIR.LCOM         | Bin 4852 -> 4988 bytes
 4 files changed, 25 insertions(+), 51 deletions(-)

diff --git a/greetfiles/MEDLEYDIR-INIT b/greetfiles/MEDLEYDIR-INIT
index 32a2e7f7..f620b2bb 100644
--- a/greetfiles/MEDLEYDIR-INIT
+++ b/greetfiles/MEDLEYDIR-INIT
@@ -1,10 +1,11 @@
 (DEFINE-FILE-INFO PACKAGE "INTERLISP" READTABLE "INTERLISP" BASE 10)
 
-
(FILECREATED " 9-Mar-2022 11:50:44" {DSK}<home>larry>medley>greetfiles>MEDLEYDIR-INIT.;2
 4690   
+
(FILECREATED "22-Nov-2022 20:59:24" {DSK}<home>frank>il>medley>wmedley>greetfiles>MEDLEYDIR-INIT.;6
 2860   
 
       :CHANGES-TO (VARS MEDLEYDIR-INITCOMS)
 
-      :PREVIOUS-DATE "28-Feb-2022 21:13:20" {DSK}<home>larry>medley>greetfiles>MEDLEYDIR-INIT.;1)
+      :PREVIOUS-DATE "22-Nov-2022 20:42:43" 
+{DSK}<home>frank>il>medley>wmedley>greetfiles>MEDLEYDIR-INIT.;5)
 
 
 (PRETTYCOMPRINT MEDLEYDIR-INITCOMS)
@@ -13,7 +14,7 @@
        ([P (LOAD? (CONCAT (OR (UNIX-GETENV "MEDLEYDIR")
                               "")
                          "/sources/MEDLEYDIR.LCOM"))
-           (MEDLEY-INIT-VARS)
+           (MEDLEY-INIT-VARS 'GREET)
            (KEYACTION 'LOCK '(LOCKTOGGLE . IGNORE]
         (FILES BACKGROUND-YIELD)
         (VARS 
@@ -38,7 +39,7 @@
                    "")
               "/sources/MEDLEYDIR.LCOM"))
 
-(MEDLEY-INIT-VARS)
+(MEDLEY-INIT-VARS 'GREET)
 
 (KEYACTION 'LOCK '(LOCKTOGGLE . IGNORE))
 
@@ -81,44 +82,7 @@
                                                :PACKAGE "INTERLISP"])
 )
 
-(ADDTOVAR FONTDEFS

-          [LARGER (FONTCHANGEFLG . ALL)
-                 (FILELINELENGTH . 102)
-                 (FONTPROFILE (DEFAULTFONT 1 (GACHA 12)
-                                     (GACHA 10)
-                                     (TERMINAL 10)
-                                     (POSTSCRIPT (TERMINAL 10)))
-                        (ITALICFONT 1 (HELVETICA 12 MIR)
-                               (GACHA 10 MIR)
-                               (MODERN 10 MIR)
-                               (POSTSCRIPT (MODERN 10 MIR)))
-                        (BOLDFONT 2 (HELVETICA 12 BRR)
-                               (HELVETICA 10 BRR)
-                               (MODERN 10 BRR)
-                               (POSTSCRIPT (HELVETICA 12 BRR)))
-                        (LITTLEFONT 3 (HELVETICA 10)
-                               (HELVETICA 6 MIR)
-                               (MODERN 10 MIR)
-                               (POSTSCRIPT (MODERN 10 MIR)))
-                        (TINYFONT 6 (GACHA 10)
-                               (GACHA 6)
-                               (TERMINAL 6)
-                               (POSTSCRIPT (TERMINAL 6)))
-                        (BIGFONT 4 (HELVETICA 12 BRR)
-                               NIL
-                               (MODERN 12 BRR)
-                               (POSTSCRIPT (MODERN 12 BRR)))
-                        (MENUFONT 5 (HELVETICA 12)
-                               (HELVETICA 12)
-                               (POSTSCRIPT (HELVETICA 12)))
-                        (COMMENTFONT 6 (HELVETICA 12)
-                               (HELVETICA 10)
-                               (MODERN 10)
-                               (POSTSCRIPT (MODERN 10)))
-                        (TEXTFONT 7 (TIMESROMAN 12)
-                               NIL
-                               (CLASSIC 12)
-                               (POSTSCRIPT (CLASSIC 12])
+(ADDTOVAR FONTDEFS
 )
 (DECLARE%: DONTCOPY
-  (FILEMAP (NIL (1949 2774 (INTERLISPMODE 1959 . 2772)))))
+  (FILEMAP (NIL (1986 2811 (INTERLISPMODE 1996 . 2809)))))
 STOP
diff --git a/greetfiles/MEDLEYDIR-INIT.LCOM b/greetfiles/MEDLEYDIR-INIT.LCOM
index 78d10ab24cb8c304e92202e95e46fb4515dde2fd..75533533494b5ed2cb6247f86da0484928cb8b55 100644
GIT binary patch
delta 485
zcmaivPfG$(6vZ7GwcbJ!0)xmdFQR#bGCp<EA&hX|41?25>DZs8=tSaQLW+oxwr)z^
z#&uu8ZP2oh(pQL9>CQ^%t`3*qJ?GqUbQpO)TctE^cW>fUrWB~GW^!sOHEPBpm)F%!
zGv8?C+g`op-Q{mbPk5jZz`qZYYMNr`*ShUqYo`v44j`;oEDPqrL?VHqUhRAJg$5Z+
zkffUyE0oxw%e22xPNiwQ0ry(D_^^M~ZF~7e1(y^+G^@zKABDa7{OM<Ds-{yI&_5P9
zLy&2^tYn$x<0D67plVqpnIMB>X$PQ#%-{W+K?1&WpTM{Mr$UVn{QBg>?+9U#PAZPe
zz$h{160V4N4Ovd1=sJdBF-U-E*iMO&>F}QD2#CLl(I6yc0uqmf*7>KnJ6$$HTigf~
r!U(Wwn=YR5Q(zppSVl9Y+hyQif#J%}Jc4*uR3@*%7a>THZCdCX*2sU6

literal 2968
zcmb_eO>g5i5KWI|FTEA$VKER;fDS6JEq}yu7TGcqtq`F^g`%Ap?IoLNlK@Fv*jW^d
zqPPBq{@)JuVM}(pMS}{6EY1uchmUWDp#h(Wn7b1pxhvv{f;S2C&sfO85wYP~iZpTH
zjpi&c>_l#vPgu&K+i4L(ErO3>h6mulp&MN-U9aPL(Cv-~opJxb0qR^Y9)G=m$ZlZq
zghAx@AU*rz-QD6bJASxYE<YbXW;YMn=i}RDmOX#Oz}0cY1Ig!s(3qVt?IW+XgWeyG
zJw*So%+~PNcUMoh+3JTekf+7--Tl)o+~bOqsgzL9t=(=raC7yH8Exl`sJ)KU`uC0X
z9eB+?pg%n902%wIEDm|<8U=L5bPCNK`zlIXFitd|2{ldK00{=i8@ZG0L&2}t9d~<U
zuk$)SyDhRl=ST${#=(eC0Ub~>c;AA(pZE6mzPiQNUjF*&uZ8{oGk<?=KfkfBUGr{q
zZpr7}eUHy~cHXypbkKoIUyf65TofalO5^fN?z?85aOioEXyx-X#h(PcgFMz($=pSQ
z)f}GCXaxJ!)QFv-qEXB|o(Zkuh{t9h4thvosq4W2#v3^wT6{YJ`e2tuI5-$J#6R2`
zdf*^8sK>HA^5SuzKWNPA9d3si2e2G!WksMn+zrAE@U)GY<IyJ?S9wVhgzAKypTFP&
zN)w<`vEV&WU&TH%K$QkMjm4!Ka)ZQxvlf|y^@M-KdAnMCT3%<Xw`*5hVg^pD1+*~b
z73f-xqUns!nQw%Ofu2tlYEmly4DH1L*Z0qi3Pa?z4I+${<}G{(<b5KA6FiJit7#m#
zbHQbRGjs9NeK<M-XO%raW6`eQ<6;R<*>CV^l`U78Ck-w{bissy?x=&qQ!bN$C*~CT
z<;aMLBeB+r$138m&EsjrHM7aKi`XtYr3yuieFY(f=DtyS9<zwQz*QA#m#>pZoKqEX
zB*;=UO}P#==f-L&1$t5vLFq3)A~(fa$hGZa4j{2O=OtHxMy$fM2v1F_IU>)nsm4O$
z95yw|l4msY`9y{l<4j(#d72*<yOey!CG<M@;FJgr3X7*0qhS)K(5!k3jGf+K;u94c
zET$AB(;?S3AM&5&^aVAMT{V%{si|nqsg?S!o~i<A=%q5&Ra3WF?c~>4SzTWcP%&+N
zvaeUsMnom#|EZ*EbN?Wx%Dp41QcacLDySx@x_KikLRk<Pg=GwD4behGg{q31&T6&|
zOj<G9TEP<KlE)#Ia2vVD`#qOn)s<=4*exV<fs&9R4s>l?`DrzdtvC`flSSbt3Z?98
zkznhqdu(|KgG%=+I8?%n8{u0-h=i_CZ3ijG_EyyKW?Tnv`YikjUJW_8mp7*k_=&dQ
zwe|4wFKio-Vq9OK7Vm*|+cl&xM)G`>UK6sh!m!)`*(^}(u)aXkXVHy_=Q;MU!EizL
z&<0do+rb74dwb23b0NYUsNYDk*oSRr*qTaiOIr<X+h_3zUgpyranM9WU!AB%T3arQ
zgWcEuTTpFsYbvRY^Y&St{}ybOdnZ2=!!HZK1Iu8<Q>`L~szIIRJM|??Q{flFB^%Z-
Nn~ldd+ZMri@;5C(;tv1-

diff --git a/sources/MEDLEYDIR b/sources/MEDLEYDIR
index a5d79746..9f9369e9 100644
--- a/sources/MEDLEYDIR
+++ b/sources/MEDLEYDIR
@@ -1,10 +1,11 @@
 (DEFINE-FILE-INFO PACKAGE "INTERLISP" READTABLE "INTERLISP" BASE 10)
 
-
(FILECREATED "25-Oct-2022 12:19:14" {DSK}<home>larry>ilisp>medley>sources>MEDLEYDIR.;11
 9572   
+
(FILECREATED "22-Nov-2022 20:50:20" {DSK}<home>frank>il>medley>wmedley>sources>MEDLEYDIR.;10
 10271  
 
       :CHANGES-TO (FNS MEDLEY-INIT-VARS)
 
-      :PREVIOUS-DATE "24-Oct-2022 22:35:01" {DSK}<home>larry>ilisp>medley>sources>MEDLEYDIR.;10)
+      :PREVIOUS-DATE "21-Nov-2022 17:31:30" {DSK}<home>frank>il>medley>wmedley>sources>MEDLEYDIR.;9
+)
 
 
 (PRETTYCOMPRINT MEDLEYDIRCOMS)
@@ -33,7 +34,11 @@
 (DEFINEQ
 
 (MEDLEY-INIT-VARS

-  [LAMBDA (EVENT)
                                            (* ; "Edited 25-Oct-2022 12:18 by lmm")


+  [LAMBDA (EVENT)
                                            (* ; "Edited 22-Nov-2022 20:38 by FGH")


+                                                             (* ; "Edited 21-Nov-2022 17:31 by FGH")


+                                                           (* ; "Edited 21-Nov-2022 15:39 by frank")


+                                                             (* ; "Edited 21-Nov-2022 14:33 by FGH")


+                                                             (* ; "Edited 25-Oct-2022 12:18 by lmm")


                                                              (* ; "Edited 18-Oct-2022 18:08 by lmm")

 
     (* ;; "Called on events including before & after loadup")

@@ -52,9 +57,8 @@
              [SETQ \SAVE.MEDLEYDIR (CONS MEDLEYDIR (FOR
 X IN
 MEDLEY-INIT-VARS
                                                       COLLECT
 (CONS (CAR X)
                                                                     (GETTOPVAL (CAR X])
-        ((AFTERSYSOUT AFTERMAKESYS AFTERLOGOUT AFTERSAVEVM RESTART INIT NIL) 
-
-                                                                      (* ;; 
+        ((AFTERSYSOUT AFTERLOGOUT AFTERSAVEVM RESTART INIT NIL) 
+                                                                (* ;; 
 
                                       "Any old values, restore them, substituting the new MEDLEYDIR")

 
              (PROG (OLDMD NEWMD SAME TMP)
@@ -81,6 +85,12 @@
                                   ELSE
 (MEDLEYSUBSTDIR
 OLDMD NEWMD (CDR TMP]
                    (SETQ \SAVE.MEDLEYDIR T)                  (* ; "only use once")

                ))
+        ((GREET) 
+             (SETQ MEDLEYDIR)
+             (SETQ MEDLEYDIR (MEDLEYDIR
))
+             [for
 X in
 MEDLEY-INIT-VARS do
 (/SETTOPVAL (CAR X)
+                                                  (EVAL (CADR X]
+             (SETQ \SAVE.MEDLEYDIR T))
         (PROGN                                               (* ; "no changes")

                NIL])
 
@@ -191,6 +201,6 @@
 (ADDTOVAR GLOBALVARS
 MEDLEYDIR MEDLEY-INIT-VARS \SAVE.MEDLEYDIR DIRECTORIES)
 )
 (DECLARE%: DONTCOPY
-  (FILEMAP (NIL (1459 7197 (MEDLEY-INIT-VARS 1469 . 4258) (MEDLEYDIR 4260 . 6215) (MEDLEYSUBSTDIR 6217
- . 7195)))))
+  (FILEMAP (NIL (1469 7896 (MEDLEY-INIT-VARS 1479 . 4957) (MEDLEYDIR 4959 . 6914) (MEDLEYSUBSTDIR 6916
+ . 7894)))))
 STOP
diff --git a/sources/MEDLEYDIR.LCOM b/sources/MEDLEYDIR.LCOM
index 999f2f55cf937ab9103974cc9cc4479fb2430800..7b1a1dae5c5759f855646bc94db0e36c01668776 100644
GIT binary patch
delta 740
zcmeyO`bTX-gs_pWUw)ack%5tsf{}rhDF{u>mJ>`XO3cf)%gnLMO-;#3t+Xqj{E|`D
zP(jJa5TV}C+{)O<%FtX%p(Hs!w;)G7MIkd!flJ9P)W=5wqHr=Jqi`6879&F?O)d>L
zPajw3AXmo_R~MkU8167KP*SLN3HGkF$;i)5wZrBh88!t&10!?8$!&~gzG$`>S{VZk
z;KFAD)N950rA5i9#df}~E<Uc2E}lVp)|Qi5nfw_mCWkUj($aQFX8?i^o0VV;Nho6-
zlwRhrmAPpnL-S-==7xHR;w=^#;viidAOg%v0I@bmq%aCHGI%h0Ffnq11h_ziFcb6E
zmziKy0t_0)W=0D7!LA`8{sCc*J_^RB<_fN0hOvPH+=&WCmKMmWj4X{Il46m;p-#ae
zKwl^rnVUg$8W|f*KFcg60E}WJ0}L!De`i*!H#b&@33d!~)k8=bo4{<+_4M-$(G7D9
z3RW;SHbv5HY=puyG*fU7a&-++FgCEnFwV#f(+VR~Q-vT`pf6bzjEv1D2eJq=1I?IR
z%_8q^X^3Hhp}C0y$R!GfW@aF5A&x;nHZWiu-9lW0K&}t-RWLNMfbf0%-TgyDHs50r
G;{yPNKfjs)

delta 630
zcmZ{hO;5r=5Qah212JAmyl8aN1fz#mcKd}JL#TE!4aI7=5H-dG0fh)kz>6_P!!J<!
zC%hW`VH}Jn4=x{##E(6_JMYXhvpb)w@A0R@m?}D@8xbck280RPBuII_T%M~JTdmtv
ztzK(4Q~p7C@d2%afG3j?Q8glC0nS>L(siR*t5?cUsur&<D(yIdXpWjTJrb=w%M%NR
z%b<1zLMCt9Fo}^QNq}<khS&auSB3THTE?=ew&PO6qvnsS@x%h$nJjz1RlROhQa?wZ
zMX;&r*l&k5QTcu?#za<00tpcPzj(?22s>fwXQsNEp1uh2)9*=vhzDXR5V5g%Nmu)C
zk<M$V<4;8%k3(xRO27uAp6Bcr3>)Nx3ZoBV`EBNzmJ2wU1Um4rf?>xdgju<Ln~KbH
zt-W259^?m}tc>f1B^dd}^y(=_aKelNl}5;+rK`VVnhq}IL+}>KF=k>v7ze>200n^V
z%!-**V6aF)9Lo`&;c~5MU}QY%4q6v-fK+{Sx1C)l&wbux=;w?qWk;-cKC>|Y1v6)<
Axc~qF