From c0bbc3d14ce2ef308eea7b63aad322a03b7a659e Mon Sep 17 00:00:00 2001
From: rmkaplan <ron.kaplan@post.harvard.edu>
Date: Thu, 16 Apr 2026 11:17:53 -0700
Subject: [PATCH] Don't want the variable MEDLEYDIR to have the value {MEDLEY}

---
 sources/MEDLEYDIR      | 114 ++++++++++++++++++++---------------------
 sources/MEDLEYDIR.LCOM | Bin 7468 -> 7483 bytes
 2 files changed, 57 insertions(+), 57 deletions(-)

diff --git a/sources/MEDLEYDIR b/sources/MEDLEYDIR
index d56a9720..c5450bc3 100644
--- a/sources/MEDLEYDIR
+++ b/sources/MEDLEYDIR
@@ -1,13 +1,13 @@
 (DEFINE-FILE-INFO :PACKAGE "INTERLISP" :READTABLE "INTERLISP" :BASE 10)
 
-
(FILECREATED "15-Apr-2026 17:27:14" {WMEDLEY}<sources>MEDLEYDIR.;51
 17370  
+
(FILECREATED "16-Apr-2026 11:06:53" {WMEDLEY}<sources>MEDLEYDIR.;53
 17488  
 
       :EDIT-BY rmk
 
       :CHANGES-TO (FNS MEDLEYDIR)
                   (VARS MEDLEYDIRCOMS)
 
-      :PREVIOUS-DATE "15-Apr-2026 16:44:33" {WMEDLEY}<sources>MEDLEYDIR.;50)
+      :PREVIOUS-DATE "15-Apr-2026 17:27:14" {WMEDLEY}<sources>MEDLEYDIR.;51)
 
 
 (PRETTYCOMPRINT MEDLEYDIRCOMS)
@@ -19,7 +19,7 @@
         (P (MOVD? 'EVQ 'PSEUDOHOST))
                                                              (* ; "For loadup")

         (FNS MEDLEY-INIT-VARS MEDLEYDIR MEDLEYSUBSTDIR SET-SYSOUT-COMMIT)
-        [INITVARS (MEDLEYDIR)
+        [INITVARS (MEDLEYDIR (MEDLEYDIR))
                (\SAVE.MEDLEYDIR)
                (SYSOUTCOMMITS (OR (AND (BOUNDP 'SYSOUTCOMMITS)
                                        SYSOUTCOMMITS)
@@ -151,7 +151,7 @@
                NIL])
 
 (MEDLEYDIR

-  [LAMBDA (DIRNAME FILENAME OUTPUT NOERROR)
                  (* ; "Edited 15-Apr-2026 17:13 by rmk")


+  [LAMBDA (DIRNAME FILENAME OUTPUT NOERROR)
                  (* ; "Edited 16-Apr-2026 11:06 by rmk")


                                                              (* ; "Edited 31-Jan-2026 23:42 by rmk")


                                                              (* ; "Edited 23-Aug-2025 17:21 by lmm")


                                                              (* ; "Edited 18-Aug-2025 11:15 by FGH")


@@ -162,60 +162,60 @@
 
     (* ;; "RMK: MEDLEYDIR defaults to DSK")

 
-    (LET (MED)
-         [SETQ MED (COND
-                      ((NULL DIRNAME)                        (* ; 
-
                                            "Call to (MEDLEYDIR) or (MEDLEYDIR NIL ...) just set it ")

-                       (if
 (OR (NOT (BOUNDP 'MEDLEYDIR))
-                               (NOT MEDLEYDIR))
-                           then
 (SETQ MEDLEYDIR (DIRECTORYNAME (if
 (SETQ MEDLEYDIR (UNIX-GETENV
-                                                                                    "MEDLEYDIR"))
-                                                                   then
 (PACKFILENAME 'BODY MEDLEYDIR
-                                                                               'HOST
-                                                                               'DSK)
-                                                                 else
 T)))
-                         elseif
 (STRPOS "/" MEDLEYDIR)
-                           then
 (SETQ MEDLEYDIR (DIRECTORYNAME MEDLEYDIR))
-                         else
 MEDLEYDIR))
-                      ((LISTP DIRNAME)
+    (if
 (NULL DIRNAME)
+        then
                                                 (* ; 
+
       "Call to (MEDLEYDIR) or (MEDLEYDIR NIL ...) just set it--Don't want MEDLEYDIR to be {MEDLEY}.")

+             (if
 (OR (NOT (BOUNDP 'MEDLEYDIR))
+                     (NOT MEDLEYDIR))
+                 then
 (SETQ MEDLEYDIR (DIRECTORYNAME (if
 (SETQ MEDLEYDIR (UNIX-GETENV "MEDLEYDIR"))
+                                                         then
 (PACKFILENAME 'BODY MEDLEYDIR
+                                                                     'HOST
+                                                                     'DSK)
+                                                       else
 T)))
+               elseif
 (STRPOS "/" MEDLEYDIR)
+                 then
 (SETQ MEDLEYDIR (DIRECTORYNAME MEDLEYDIR))
+               else
 MEDLEYDIR)
+      else
 (LET (MED)
+                [SETQ MED (COND
+                             ((LISTP DIRNAME)
 
-                       (* ;; "(MEDLEYDIR a list -- recurse")

+                              (* ;; "(MEDLEYDIR a list -- recurse")

 
-                       (for
 X Y in
 DIRNAME when
 (SETQ Y (MEDLEYDIR
 X FILENAME OUTPUT NOERROR))
-                          collect
 Y))
-                      [FILENAME 
+                              (for
 X Y in
 DIRNAME when
 (SETQ Y (MEDLEYDIR
 X FILENAME OUTPUT NOERROR))
+                                 collect
 Y))
+                             [FILENAME 
 
-                             (* ;; " if FILENAME, find it as a file. ")

+                                    (* ;; " if FILENAME, find it as a file. ")

 
-                             (if
 (NULL (SETQ DIRNAME (MEDLEYDIR
 DIRNAME NIL OUTPUT NOERROR)))
-                                 then
 (OR NOERROR (SHOULDNT))
-                                      NIL
-                               else
 (SETQ FILENAME (CONCAT DIRNAME FILENAME))
-                                    (if
 OUTPUT
-                                        then
 FILENAME
-                                      else
 (OR (INFILEP FILENAME)
-                                               (if
 NOERROR
-                                                   then
 NIL
-                                                 else
 (ERROR "No such medley file" FILENAME]
-                      ((EQUAL DIRNAME "login")               (* ; "special case for login dir")

-                       (DIRECTORYNAME (OR (UNIX-GETENV "LOGINDIR")
-                                          (UNIX-GETENV "HOME")
-                                          DIRNAME)))
-                      [(EQUAL DIRNAME "loadups")             (* ; "special case for loadups dir")

-                       (OR (DIRECTORYNAME (UNIX-GETENV "MEDLEY¬LOADUPS¬DIR"))
-                           (DIRECTORYNAME (CONCAT (MEDLEYDIR
)
-                                                 "loadups" ">")
-                                  NIL OUTPUT)
-                           (if
 NOERROR
-                               then
 NIL
-                             else
 (ERROR "Cannot find medley loadups directory" (MEDLEYDIR
]
-                      (T (OR (DIRECTORYNAME (CONCAT (MEDLEYDIR
)
-                                                   DIRNAME ">")
-                                    NIL OUTPUT)
-                             (if
 NOERROR
-                                 then
 NIL
-                               else
 (ERROR "No such medley directory" DIRNAME]
-         (CL:WHEN MED (PSEUDOFILENAME MED])
+                                    (if
 (NULL (SETQ DIRNAME (MEDLEYDIR
 DIRNAME NIL OUTPUT NOERROR)))
+                                        then
 (OR NOERROR (SHOULDNT))
+                                             NIL
+                                      else
 (SETQ FILENAME (CONCAT DIRNAME FILENAME))
+                                           (if
 OUTPUT
+                                               then
 FILENAME
+                                             else
 (OR (INFILEP FILENAME)
+                                                      (if
 NOERROR
+                                                          then
 NIL
+                                                        else
 (ERROR "No such medley file" FILENAME]
+                             ((EQUAL DIRNAME "login")        (* ; "special case for login dir")

+                              (DIRECTORYNAME (OR (UNIX-GETENV "LOGINDIR")
+                                                 (UNIX-GETENV "HOME")
+                                                 DIRNAME)))
+                             [(EQUAL DIRNAME "loadups")      (* ; "special case for loadups dir")

+                              (OR (DIRECTORYNAME (UNIX-GETENV "MEDLEY¬LOADUPS¬DIR"))
+                                  (DIRECTORYNAME (CONCAT (MEDLEYDIR
)
+                                                        "loadups" ">")
+                                         NIL OUTPUT)
+                                  (if
 NOERROR
+                                      then
 NIL
+                                    else
 (ERROR "Cannot find medley loadups directory" (MEDLEYDIR
]
+                             (T (OR (DIRECTORYNAME (CONCAT (MEDLEYDIR
)
+                                                          DIRNAME ">")
+                                           NIL OUTPUT)
+                                    (if
 NOERROR
+                                        then
 NIL
+                                      else
 (ERROR "No such medley directory" DIRNAME]
+                (CL:WHEN MED (PSEUDOFILENAME MED])
 
 (MEDLEYSUBSTDIR

   [LAMBDA (OLD
 NEW BODY)
                          (* ; 
@@ -245,7 +245,7 @@
            SYSOUTCOMMITS])
 )
 
-(RPAQ? MEDLEYDIR
 )
+(RPAQ? MEDLEYDIR
 (MEDLEYDIR))
 
 (RPAQ? \SAVE.MEDLEYDIR
 )
 
@@ -303,6 +303,6 @@
 (ADDTOVAR GLOBALVARS
 MEDLEYDIR MEDLEY-INIT-VARS \SAVE.MEDLEYDIR DIRECTORIES SYSOUTCOMMITS)
 )
 (DECLARE%: DONTCOPY
-  (FILEMAP (NIL (5517 14653 (MEDLEY-INIT-VARS 5527 . 9158) (MEDLEYDIR 9160 . 13453) (MEDLEYSUBSTDIR 
-13455 . 14433) (SET-SYSOUT-COMMIT 14435 . 14651)))))
+  (FILEMAP (NIL (5529 14760 (MEDLEY-INIT-VARS 5539 . 9170) (MEDLEYDIR 9172 . 13560) (MEDLEYSUBSTDIR 
+13562 . 14540) (SET-SYSOUT-COMMIT 14542 . 14758)))))
 STOP
diff --git a/sources/MEDLEYDIR.LCOM b/sources/MEDLEYDIR.LCOM
index d6328855f6355dc2b546014e86fca3c9f5f1cf4a..f7cfaf917a86b9a620931e85682ec797c59b7139 100644
GIT binary patch
delta 984
zcmZuvJ#W)c6m^tP7gIqCLue)7%3^4cqWXRKD@Z7=ZJN-;HntNbLP!B2T0})c5p#Y3
z3y~#OCYZv|hD;3n1jLTik%5u13-2`|aRMH$-g)QT`|ds0!_t@1+twAWX!Q<@Siu?~
zR8q8(N(RrBby5IHM(T{jq=fYnH3y$>Wz@mRRpTE{HROV{dAC|~?a;Mi*8v&*r+TuL
z0g(XGsbM6|%tJ}%g%OoON>Jv;=tt&LZet({Lasb|xhJsiJP+?WJdVud<C4}~?Q+oJ
zLE_<khsQHro}X4bXK`&+C}+plt>eS;{<gis?;Z=|+xCZLe*C(BB>Y~xzf{eR#e0{J
zgrCWVC?_rPTc4N)1d-ctd_Ik5)m<Ql0d5%jArKvbQw?1^_QUps(<s=!XIn84l|bEf
zYHpiJfKV-su(_Cs@ibA<r_w&lRFnlRHdSbN)mCxGja{z^Sf`5$O`BJ!bRHuLRgX^;
z05Z+LFC$%<z8nIg1o~0MZ`2$w21Ib0Qx+#T6^P<6@FUO`XVWkQmc2VOP?>86Vc7N?
zo)fTN1~D)*4JrM!Yi1f4YD&lqm}RLtIMFVs7%F}g1D&}U0_ATxZMK|L0y0t{rDpx)
z*tT&}kgiFp3GyA8?GYt`RCtQ?31t1s2i-?cUiV(f5@6<nJn3Xu^DU<lL_@ZH8L*Mk
z0oD-66~FE>g0i|bf2ZnAbd)g%-Mwco7)4NWBCRj8l3NU^#}`hsE3i2ow2+)$yqS@b
TH~C=HyYx$(<3<ni-_QL45M=Nj

delta 996
zcmZXS%}*0S6u`SFQk)nRF+oExFB1=~k+5&}drb(-?g*8#Tee#Q2a~EGpw$uyiJtl|
zNH#IvjW;}$%E^N_&w4lU&+uSkoUyTN%N*X!%lp0W`RpFMZ#E{4S#SU4EK`{YXt~UC
z(K&ji-oO$NikLB~E;3hFk3QX2@aX4t`@GGeB~rXsu5dr*Ucv*Qcs{zG&M8npkxaAH
zbX|EsOjp-kO`||kRBkG2_lNRvWaeEVmm8V5l3O@^wUZO)q7-i%Qg-jA??=t~jxyhp
zYC{Sl#mTjXy#Aq6^3_qM8@+onf1)l-tc{lQr-l1hJ4!yCE70i^zOcLKUy{h9-08Ug
zVN5>1>~?Zr(`w;cTUQOJ)_6ULWLu%P%0Y7s;Bg$qpjkEq<(T_P6mRxy7J?szzL$Vz
zs<6s~3f~k6Xoi;6G;`RIIekae`)FHus@5>8GN^~;joBrh@NgZNjY9;pv_ZneL7gF#
zL)lRkm}>sdjH0vJa#XJbVFGB2GTQwHP<Q%O#enCElCDWyjcQ=Ap=wMqLeF108{lAZ
zXux7r4}+@sJIJy_Lu|8wq*=|$l9rX>#NdP43K#|~N3{fuEU3$5!6s;S#z9QuY*U!Q
zOQWPHP$va4LrfFsJOxd+(<M@BGrgyx1GL$CxOKRHKnXC%0@@39T#3A(UacLA{Zp}|
z3<u1#fi6d@To?=yw-POt!ycy#OS84J_d=LNl{9R@!Qtawc)q>W+<pyD_L|!wk3D7p
ios(g^zsT==`e*zW5kIo%g#i>v_s(TD)_pql{lZ_T3GycZ