From b8c0c594a98e93eb60e8e898a33ca8438f85f882 Mon Sep 17 00:00:00 2001
From: rmkaplan <ron.kaplan@post.harvard.edu>
Date: Sun, 8 Mar 2026 09:26:18 -0700
Subject: [PATCH] DFV gets FNS and/or FNS, depending on what definitions exist

---
 lispusers/VERSIONDEFS       |  49 +++++++++++++++++++++---------------
 lispusers/VERSIONDEFS.LCOM  | Bin 2381 -> 2678 bytes
 lispusers/VERSIONDEFS.TEDIT | Bin 5806 -> 6094 bytes
 3 files changed, 29 insertions(+), 20 deletions(-)

diff --git a/lispusers/VERSIONDEFS b/lispusers/VERSIONDEFS
index 97896c14..9920f955 100644
--- a/lispusers/VERSIONDEFS
+++ b/lispusers/VERSIONDEFS
@@ -1,22 +1,21 @@
-(DEFINE-FILE-INFO PACKAGE "INTERLISP" READTABLE "INTERLISP" BASE 10)
+(DEFINE-FILE-INFO :PACKAGE "INTERLISP" :READTABLE "INTERLISP" :BASE 10 :FORMAT :UTF-8)
 
-
(FILECREATED "27-Jan-2025 08:49:34" {WMEDLEY}<lispusers>VERSIONDEFS.;12
 5880   
+
(FILECREATED " 7-Mar-2026 22:55:43" {WMEDLEY}<lispusers>VERSIONDEFS.;18
 6534   
 
       :EDIT-BY rmk
 
-      :CHANGES-TO (FNS GETVINFO)
-
-      :PREVIOUS-DATE "12-Dec-2024 15:07:45" {WMEDLEY}<lispusers>VERSIONDEFS.;11)
+      :PREVIOUS-DATE " 6-Mar-2026 22:47:25" {WMEDLEY}<lispusers>VERSIONDEFS.;17)
 
 
 (PRETTYCOMPRINT VERSIONDEFSCOMS)
 
-(RPAQQ VERSIONDEFSCOMS
 [(FNS FINDFILEVERSION GETVINFO VERSIONP)
-                        (FNS EDV DFV)
-                        (DECLARE%: DONTEVAL@LOAD DOEVAL@COMPILE DONTCOPY COMPILERVARS
-                               (ADDVARS (NLAMA DFV EDV)
-                                      (NLAML)
-                                      (LAMA])
+(RPAQQ VERSIONDEFSCOMS

+       [(FNS FINDFILEVERSION GETVINFO VERSIONP)
+        (FNS EDV DFV)
+        (PROP ARGNAMES EDV DFV)
+        (DECLARE%: DONTEVAL@LOAD DOEVAL@COMPILE DONTCOPY COMPILERVARS (ADDVARS (NLAMA DFV EDV)
+                                                                             (NLAML)
+                                                                             (LAMA])
 (DEFINEQ
 
 (FINDFILEVERSION

@@ -119,16 +118,26 @@
           (CAR VINFO])
 
 (DFV

-  [NLAMBDA ARGS
                                              (* ; "Edited  6-Dec-2024 21:29 by rmk")


+  [NLAMBDA ARGS
                                              (* ; "Edited  6-Mar-2026 22:42 by rmk")


+                                                             (* ; "Edited  6-Dec-2024 21:29 by rmk")


                                                              (* ; "Edited  2-Dec-2024 00:08 by rmk")

     (SETQ ARGS (MKLIST ARGS))
-    (APPLY (FUNCTION EDV)
-           (LIST (POP
 ARGS)
-                 NIL
-                 (POP
 ARGS)
-                 (POP
 ARGS)
-                 (POP
 ARGS])
+    (LET ((NAME (POP
 ARGS)))                                 (* ; "If FNS and FUNCTIONS, show both")

+         (CL:WHEN (HASDEF NAME 'FUNCTIONS '?)
+             (APPLY (FUNCTION EDV)
+                    (LIST NAME 'FUNCTIONS (POP
 ARGS)
+                          (POP
 ARGS)
+                          (POP
 ARGS))))
+         (CL:WHEN (HASDEF NAME 'FNS '?)
+             (APPLY (FUNCTION EDV)
+                    (LIST NAME 'FNS (POP
 ARGS)
+                          (POP
 ARGS)
+                          (POP
 ARGS))))])
 )
+
+(PUTPROPS EDV
 ARGNAMES
 (NAME TYPE FILE VERSION DIRLST . VINFO))
+
+(PUTPROPS DFV
 ARGNAMES
 (NAME FILE VERSION DIRLST . VINFO))
 (DECLARE%: DONTEVAL@LOAD DOEVAL@COMPILE DONTCOPY COMPILERVARS 
 
 (ADDTOVAR NLAMA
 DFV EDV)
@@ -138,6 +147,6 @@
 (ADDTOVAR LAMA
 )
 )
 (DECLARE%: DONTCOPY
-  (FILEMAP (NIL (671 4570 (FINDFILEVERSION 681 . 2128) (GETVINFO 2130 . 4253) (VERSIONP 4255 . 4568)) (
-4571 5717 (EDV 4581 . 5281) (DFV 5283 . 5715)))))
+  (FILEMAP (NIL (706 4605 (FINDFILEVERSION 716 . 2163) (GETVINFO 2165 . 4288) (VERSIONP 4290 . 4603)) (
+4606 6230 (EDV 4616 . 5316) (DFV 5318 . 6228)))))
 STOP
diff --git a/lispusers/VERSIONDEFS.LCOM b/lispusers/VERSIONDEFS.LCOM
index 362599322359544174601a5a123b2927ff828eee..3914a5c64145efa6a1774ff317a052e4d9bbca4a 100644
GIT binary patch
delta 747
zcma)4&1%$87)>n75Lb$eBBF;VI1w`DKk41r%;cuMnn^-(6PTTyMpU#~iaUj@T@LdI
zzJa>$6Nqo%W9ZhKOtGd5F<ipO`Of+Nzg_=%qa8;yW+~NUmQbCgaR!oyvnSymh00P+
zi-eWA3R2K8;^8#808hh`!ZbkQteA%!q~ft2Xo@oK0?ver(+DbjeSUDFTZZMqvWV*v
z$5t^`4_C(z+dzXdV3-~;ZDIu~mWOYTj$hwz@bV4RxJnZI9ceO|sAvw}J!^&;HhSAv
zwf`w&_2KSL0ME4@5E?PAPZu~jdIg2#1+7_Dm3kz)5GlMt6OK<TclG|B?0@+#M^_%_
zFp!3G3MP!O*ef+iA7yDv-fgx%HLDjlmr^6|URp}0*JNq`xg@^+ceS%VKj`fZye6Yt
zw@)upzG_3toz@g3hk2eXuw!FCEX69}duNdCo<U*=rr{w@OR*>eG^!B<c!a?2F(*J=
zr8CYlL2#_zZyUmIx#tcMLp(7L&KI+6o)_XYux>|BxAP*)yKcMA%U&GCwOHu-$7p-~
zYm~N%rghSacgzjr4}ILvi!XAD?p#pQq7-!?VntGNOi*_hInayf=jk^3e@ZVaDNB^!
DCPT26

delta 472
zcmZvY%}T>S6onHD(q<)65JcoMC}zMZNla)vxM<o;<7h}jl2*EGn_!FfhpHgB=o2WE
zJc6#>_y9hEuj5uz7gb8{@^a31&pluH&+VCPu{w7dsdI-B?$#Ty@0qm=(`JCU8#3SF
zfrnt<XQmaJRcB>gH3J5!f+a~_5NfF`WELQ;NX|PWqA8jIN{Q-adZHtcQExn)3~u5G
z#v?%RcsYNDnTA0^YWdHgX;dv!T|v;D#!E;1Fqz&SQm|Rr`VBfr5%s3yz<+O{P(ToM
z?$Q%$p$5V$QS<AvCdcAIsDV)`DL|RULsD(Sba)N4c4oRZ3rN_26yyfWJQ%3wvleeO
z17f8u08%w##l1xdI;aL!ic~iiU{QU46Rpi74hopQ9bga)LCA=eDDx7{`@3D?N=T<7
vRyMlAM?X2u?&Y@x*+|u%=d{xYR2`VrO1`uA$y07el#<t+o5dJQE_b9K<VbW>

diff --git a/lispusers/VERSIONDEFS.TEDIT b/lispusers/VERSIONDEFS.TEDIT
index f869387e3addda0ab4440345ce748e59c8d35b43..7b67a98fa41a2d51627c9a4055a54952385aed4f 100644
GIT binary patch
delta 631
zcmb7B%Syvg5S`oBzEFHn-3T(ELL%BKx^fq9QVr&zNflg18*OMwiY+aQ(3Kw`K|jHz
z2-&&Q4{+f^@DJSh3+lafAwd^<7sKJqnRA9aHw%xY+ly2frY^&|f%j-G9g;*hi0(62
zB-+ajlO7rR0L`nrD3|B)z-csEsK~q6_1ZNo8#X$AwG<p<dB>m?)#OAA+cg*4Crx)A
zt8UZvtDb*^fsfsqcTi*0q33&TFYsF!9HJrV3OdIwIvvMrIQtE^m<Rrnf~{=tMA!M*
zOs@oK-INu}fUn-9KsO|7%QClY6sW1078Y?$ljx=>ve8AzP))LJmHth?1lfvW>8c@V
zknM-Z1A0Fa{<Ba5;9EZUi+$Xk$(JEtQFX<(OkFZy29OWMSBlR>>toM^B*Uq~3afVE
zoYj}YE3v|d@iN1?38$9?NC06*quh-H#(b4D2QjAq3!KUE78fpZz?l>WoEhPO2txlB
nia||THP+c3bV_Ye6#Lg%Ws+%Gswk_2_0HP_K>i8NPVYVe1AK=o

delta 331
zcmX@7zfO0<L>8w143j6aOa)PDtp9-2W)-%{j4T;Nsi~WHvQJ|KiTHE!GaCJ8VC4PJ
z;GCF~Q>@_X5~fg|S(2gP=jo%6SgcTzk*ZKqS&*uukeHpBr%;lw;NqsIu=ygFA$x`h
z1DmhEi))Y{0~Z4fh%&G{`#1&%dpaWtiZO76xCZ%p`Z@YAaKKbDU}$GzKoaADr~`^g
zO#Ub&%*e1=LHHUYBkSbvA|^mmN3@lTm4ShYff1-qZt`C-<;nL%_b`S`o-O7Elzt?Z
t=mM7pTM1If3^Ef$$b%Rl5uou95wH}ai(`nZRi?_06b1&a*$fp`y8!7&LN)*Z