From 192c79e493001d892fee812523a7d63c6009c157 Mon Sep 17 00:00:00 2001
From: rmkaplan <ron.kaplan@post.harvard.edu>
Date: Sun, 28 Sep 2025 10:00:32 -0700
Subject: [PATCH 1/8] EDITINTERFACE--ED searches for symbols, no error when
 declining a loadfns

---
 sources/EDITINTERFACE      |  86 +++++++++++++++++++++----------------
 sources/EDITINTERFACE.LCOM | Bin 16680 -> 16604 bytes
 2 files changed, 48 insertions(+), 38 deletions(-)

diff --git a/sources/EDITINTERFACE b/sources/EDITINTERFACE
index 1ce6c0681..1cdf0a604 100644
--- a/sources/EDITINTERFACE
+++ b/sources/EDITINTERFACE
@@ -1,18 +1,15 @@
 (DEFINE-FILE-INFO PACKAGE "INTERLISP" READTABLE "INTERLISP" BASE 10)
 
-
(FILECREATED "21-May-2024 22:10:45" {DSK}<home>matt>Interlisp>medley>sources>EDITINTERFACE.;2
 47745  
+
(FILECREATED "26-Sep-2025 15:26:08" 
+{DSK}<Users>kaplan>Local>medley3.5>working-medley>sources>EDITINTERFACE.;49
 48723  
 
-      :EDIT-BY "mth"
+      :EDIT-BY rmk
 
-      :CHANGES-TO (FNS EDITLOADFNS?)
-
-      :PREVIOUS-DATE "22-Jun-2022 13:32:08" {DSK}<home>matt>Interlisp>medley>sources>EDITINTERFACE.;1
-)
+      :CHANGES-TO (FNS EDITDEF.FNS)
 
+      :PREVIOUS-DATE "13-Dec-2024 12:47:48" 
+{DSK}<Users>kaplan>Local>medley3.5>working-medley>sources>EDITINTERFACE.;47)
 
-(* ; "
-Copyright (c) 1986-1988, 1990-1991, 2024 by Venue & Xerox Corporation.
-")
 
 (PRETTYCOMPRINT EDITINTERFACECOMS)
 
@@ -110,7 +107,8 @@ Copyright (c) 1986-1988, 1990-1991, 2024 by Venue & Xerox Corporation.
 (DEFGLOBALVAR XCL::ED-LAST-INFO
 NIL
    "used in ED to stash last call info so (ED NIL) will restart last edit")
 
-(CL:DEFUN ED
 (CL::NAME CL::OPTIONS)
                          (* ; "Edited  5-Jul-88 16:03 by woz")

+(CL:DEFUN ED
 (CL::NAME CL::OPTIONS)
                          (* ; "Edited 20-Dec-2023 00:06 by rmk")


+                                                             (* ; "Edited  5-Jul-88 16:03 by woz")

 
 (* ;;; "Standard Common Lisp editor entry.  CLtL say's ED does something reasonable when passed a pathname.  We coerce name into something that might be the name of something with an IL:FILES definition, & try to edit  that.  Then save call info in ED-LAST-INFO, so (ED) will start last edit over again.")

 
@@ -122,7 +120,7 @@ Copyright (c) 1986-1988, 1990-1991, 2024 by Venue & Xerox Corporation.
        (CL:PUSHNEW 'FILES CL::OPTIONS))
    [COND
       (CL::NAME (CL:SETQ XCL::ED-LAST-INFO (CONS CL::NAME CL::OPTIONS)))
-      (T (CL:WHEN (NULL XCL::ED-LAST-INFO)
+      (T (CL:UNLESS XCL::ED-LAST-INFO
              (CL:FORMAT T "Sorry, there is no previous edit to restart.")
              (CL:RETURN-FROM ED NIL))
          (CL:SETQ CL::NAME (CAR XCL::ED-LAST-INFO))
@@ -131,8 +129,9 @@ Copyright (c) 1986-1988, 1990-1991, 2024 by Venue & Xerox Corporation.
    (LET* ((CL::FROM-DISPLAY (OR (EQ CL::OPTIONS T)
                                 (CL:MEMBER :DISPLAY CL::OPTIONS)
                                 (CL:MEMBER 'DISPLAY CL::OPTIONS)))
-          (CL::GIVEN-TYPES (for
 X inside
 CL::OPTIONS when
 (NEQ X T) bind
 TYPE
-                              when
 (CL:SETQ TYPE (GETFILEPKGTYPE X 'TYPES T CL::NAME)) collect
 TYPE))
+          (CL::GIVEN-TYPES (for
 CL::X TYPE inside
 CL::OPTIONS unless
 (EQ CL::X T)
+                              when
 (CL:SETQ TYPE (GETFILEPKGTYPE CL::X 'TYPES T CL::NAME))
+                              collect
 TYPE))
           [CL::TYPES-WITH-DEFNS (TYPESOF CL::NAME CL::GIVEN-TYPES NIL
                                        (CL:IF (OR (CL:MEMBER :CURRENT CL::OPTIONS)
                                                   (CL:MEMBER 'CURRENT CL::OPTIONS))
@@ -144,10 +143,10 @@ Copyright (c) 1986-1988, 1990-1991, 2024 by Venue & Xerox Corporation.
           (CL::POSSIBLE-TYPES (COND
                                  ([AND (NULL CL::GIVEN-TYPES)
                                        (CL:SYMBOLP CL::NAME)
-                                       (NOT (NULL *ED-OFFERS-PROPERTY-LIST*))
-                                       (find
 X on
 (GETPROPLIST CL::NAME) by
 (CDDR X)
-                                          suchthat
 (NULL (GET (CAR X)
-                                                              'PROPTYPE]
+                                       *ED-OFFERS-PROPERTY-LIST*
+                                       (find
 CL::X on
 (GETPROPLIST CL::NAME)
+                                          by
 (CDDR CL::X) suchthat
 (NULL (GET (CAR CL::X)
+                                                                              'PROPTYPE]
 
                                  (* ;; "if we're supposed to offer PROPERTY-LIST as an edit type, and this name has a property list with other than system properties on it, then add IL:PROPERTY-LIST to the possible types.")

 
@@ -183,16 +182,15 @@ Copyright (c) 1986-1988, 1990-1991, 2024 by Venue & Xerox Corporation.
                                               (CL:FORMAT NIL "Edit which ~A definition of ~S ? " 
                                                      CL::POSSIBLE-TYPES CL::NAME)
                                               CL::POSSIBLE-TYPES))
-                         elseif
 (NOT (NULL CL::POSSIBLE-TYPES))
+                         elseif
 CL::POSSIBLE-TYPES
                            then
 
                                 (* ;; "Exactly one type was found.")

 
-                                (if
 CL::FROM-DISPLAY
-                                    then
                     (* ; "prepare the prompt window")

-                                         (TERPRI PROMPTWINDOW))
-                                (CL:FORMAT (if
 CL::FROM-DISPLAY
-                                               then
 PROMPTWINDOW
-                                             else
 T)
+                                (CL:WHEN CL::FROM-DISPLAY    (* ; "prepare the prompt window")

+                                    (TERPRI PROMPTWINDOW))
+                                (CL:FORMAT (CL:IF CL::FROM-DISPLAY
+                                               PROMPTWINDOW
+                                               T)
                                        "Editing ~A ~A ~S.~%%"
                                        (CAR CL::POSSIBLE-TYPES)
                                        (CL:IF (EQ (CAR CL::POSSIBLE-TYPES)
@@ -201,6 +199,18 @@ Copyright (c) 1986-1988, 1990-1991, 2024 by Venue & Xerox Corporation.
                                            "definition of")
                                        CL::NAME)
                                 (CAR CL::POSSIBLE-TYPES)
+                         elseif
 [for
 CL::N CL::NTYPES in
 (CL:FIND-ALL-SYMBOLS CL::NAME)
+                                   when
 (CL:SETQ CL::NTYPES (TYPESOF CL::N CL::GIVEN-TYPES))
+                                   collect
 (CONS CL::N CL::NTYPES)
+                                   finally
 (RETURN (if
 (CDR $$VAL)
+                                                       then
 NIL 
+                                                             (* ; "More than one name")

+                                                     elseif
 (CDDAR $$VAL)
+                                                       then
 NIL 
+                                                             (* ; "More than one type")

+                                                     else
    (* ; "One name one type")

+                                                          (CL:SETQ CL::NAME (CAAR $$VAL))
+                                                          (CADAR $$VAL]
                          else
 
                               (* ;; "No types were found.  Use the DefDefiner prototyping machinery.")

 
@@ -284,21 +294,22 @@ Copyright (c) 1986-1988, 1990-1991, 2024 by Venue & Xerox Corporation.
 (DEFINEQ
 
 (EDITDEF.FNS

-  [LAMBDA (NAME EDITCOMS OPTIONS)
                        (* ; "Edited 20-Nov-87 14:25 by woz")

-
+  [LAMBDA (NAME EDITCOMS OPTIONS)
                            (* ; "Edited 26-Sep-2025 15:23 by rmk")


+                                                             (* ; "Edited 20-Nov-87 14:25 by woz")

     (PROG (DEF)
       LP  (COND
              ((EXPRP (SETQ DEF (OR (GET NAME 'ADVISED)
                                    (GET NAME 'BROKEN)
                                    NAME)))
               (EDITE
 (if
 (LITATOM DEF)
-                             then
 (GETD DEF)
-                           else
 DEF)
+                         then
 (GETD DEF)
+                       else
 DEF)
                      EDITCOMS NAME 'FNS NIL OPTIONS)
               (RETURN NAME))
              ([EXPRP (SETQ DEF (GETPROP NAME 'EXPR]
+
               (* ;; 
-
"woz: don't use edit type PROP anymore.  Let putdef for fns worry about where the definition goes.")

+
  "woz: don't use edit type PROP anymore.  Let putdef for fns worry about where the definition goes.")

 
               (EDITE
 DEF EDITCOMS NAME 'FNS NIL OPTIONS)
               (RETURN NAME))
@@ -308,7 +319,7 @@ Copyright (c) 1986-1988, 1990-1991, 2024 by Venue & Xerox Corporation.
                 (* ;; "Used to call EDITFERROR to check for MACROS definition or install dummy FNS defintion.  FNS can no longer be coerced to MACROS, and the new prototype stuff handles the other case.  So if we're here, it's because EDITFB failed to find the definition, and thus NAME is not editable.")

 
                 (CL:FORMAT *ERROR-OUTPUT* "Could not find fns definition for ~a." NAME)
-                (ERROR "Could not find fns definition for " NAME T])
+                (RETURN])
 
 (EDITF

   [NLAMBDA EDITFX
                                        (* ; "Edited 11-Jun-90 15:44 by jds")

@@ -952,13 +963,12 @@ Copyright (c) 1986-1988, 1990-1991, 2024 by Venue & Xerox Corporation.
 
 (ADDTOVAR LAMA
 )
 )
-(PUTPROPS EDITINTERFACE COPYRIGHT ("Venue & Xerox Corporation" 1986 1987 1988 1990 1991 2024))
 (DECLARE%: DONTCOPY
-  (FILEMAP (NIL (4081 10380 (ED 4081 . 10380)) (10382 14358 (INSTALL-PROTOTYPE-DEFN 10382 . 14358)) (
-14359 31218 (EDITDEF.FNS 14369 . 15705) (EDITF 15707 . 16587) (EDITFB 16589 . 17437) (EDITFNS 17439 . 
-18759) (EDITLOADFNS? 18761 . 22637) (EDITMODE 22639 . 24649) (EDITP 24651 . 25162) (EDITV 25164 . 
-25803) (DC 25805 . 26486) (DF 26488 . 27530) (DP 27532 . 28616) (DV 28618 . 29190) (EDITPROP 29192 . 
-29411) (EF 29413 . 29742) (EP 29744 . 29927) (EV 29929 . 30108) (EDITE 30110 . 30988) (EDITL 30990 . 
-31216)) (31568 46885 (NEW/EDITDATE 31578 . 31800) (FIXEDITDATE 31802 . 40409) (EDITDATE? 40411 . 43439
-) (EDITDATE 43441 . 44888) (SETINITIALS 44890 . 46883)))))
+  (FILEMAP (NIL (4033 11389 (ED 4033 . 11389)) (11391 15367 (INSTALL-PROTOTYPE-DEFN 11391 . 15367)) (
+15368 32291 (EDITDEF.FNS 15378 . 16778) (EDITF 16780 . 17660) (EDITFB 17662 . 18510) (EDITFNS 18512 . 
+19832) (EDITLOADFNS? 19834 . 23710) (EDITMODE 23712 . 25722) (EDITP 25724 . 26235) (EDITV 26237 . 
+26876) (DC 26878 . 27559) (DF 27561 . 28603) (DP 28605 . 29689) (DV 29691 . 30263) (EDITPROP 30265 . 
+30484) (EF 30486 . 30815) (EP 30817 . 31000) (EV 31002 . 31181) (EDITE 31183 . 32061) (EDITL 32063 . 
+32289)) (32641 47958 (NEW/EDITDATE 32651 . 32873) (FIXEDITDATE 32875 . 41482) (EDITDATE? 41484 . 44512
+) (EDITDATE 44514 . 45961) (SETINITIALS 45963 . 47956)))))
 STOP
diff --git a/sources/EDITINTERFACE.LCOM b/sources/EDITINTERFACE.LCOM
index bf5ab79259ba2ea6ae52db4d6019bf40b66f8324..eabdfeddd9aa2a810520a9cf42347cfecaa89af6 100644
GIT binary patch
delta 1916
zcmb7FOKclO81}6DNS%h-sZfhC?$0(&Z6T+g-PxB@rQX=<*v;DOcsHb>fRogwj*=$n
zLn>8OMO3{YIM6PSUMi#>P!SxGIFUFY8H9wy<I*dSGZIoo1PCEism$1UxQGK-*39hu
z|NQgM_kHuvz3b?Q*U($1_RBH5x)2lMf&^Gf2y!B>-kf>r$mqrDg^L3-lMAzxa|7o5
znaSCKbJfah^@`Xh4P2hTFf%=OHs(G+;YFfFffw4t#1mLZh$;_0K4s;LIn#(`Xj9=~
zdJg!^sA)pGe_vl850%MF)ylucAqpS$McDdO$<Q4m{SPN;BWb$Z)wDf)?fC!69Ehq2
zA|#A-&WR0<!-aD*;7g>kdSS@0V~z!pOu+_bO&gg$I*vl3STdf^S)+C=O|t<Wi?MX|
z3<Hn=JvLDigq{39<kHa&BS)0_Uhd0Iq`4n;26sk*YwWN8+7(8q*A49Z22Hp>?n^J;
zUH05ae$IX6sU^>P=&z=C?PC4XtI0jA4~%qMLGRjLD^%fDltyjIKxIDXW2SP?$^nbF
zdV*zWSmCv93u?h~xEyL&L9QHJ`qqNpa=5Yd8{)W|wKuE~LQ|dw?KsrEc0JjO(Nnp#
z{OGbjnXgs!uAMAu((j4LnzjiM$g1Gp_a8heV*<{2(Xg!yNU8!UGm*&^(lOmMWA=D{
z&@ye16wSTn|DIED{e{3gJ~Z#HKfSP{MkBgcLknCSyAMJ=^~5uUP8l+QVbnHCV^%3m
zN$?CI<VCGBPkAaRfIJf{ofXJ3biDP0+1cR{cQq2}l$B<31`y)@6ghNIfMUrinzjR?
z3PXm|{L0x*{kbUa;7GjwGTwzag56hy+Z+*YiN8dti1S9l$(Tbd4+Ts;KbY3-W)M1|
zLdGgFi{^HaQ19t|J3VMDyz0HajNVLooBfR>*BV?607_QS81J4Wu|qwbEa?f>gqnUN
z$#JK=YZL_JU9sJFNv!8cmQt|vMU(FJ`e#{$#$f#pn`}+p$}WB2{!GGDCwrv#M_#x5
z-5mNf8wfnXlt7d4e3<l)L6+jRzWOy?ciM~Q*^W(BtbQ`gdC}>ncve3?IXqLVOiwUt
z*KXFnw0hfpC`n!OsNCK3xx4)6ygMNGcBN1`v^g{4o|g|S3Z96h32>}bH1(8D*%e!=
zpts}%NTLJ<dap{9c0p)2V7$E~E^k?YXcDBXLP~e&Fb?+UpzV}$g&`oa3I!+2f~Bl9
z<yBIEnih+e4TN&qaw`H6WXK!&K@epbj_Ho0r?PY$-`+x$w$l|!ODD}sEz+8hYmKnH
z5wOn~8P!b?<76wq2@o`KGqeK&)p@g2u(}{9YTJk0j)fr6MNO2_Ac)&Xrs1&Ac2KOT
z?sv-3!&LdjqESlewxO3w`Z!e_fwYk_^^)%7tb%<c;SQ>Ag9v;Acp!=bJnaMwk$&iB
z|Nbb5B6j~!FNdj4Rf_ATpy^e5*nvD;awagfd(7`HYJV<@Z8-?^S!f4az*4(4E<9$%
z8s20XtB)N;*0u~XW{5JjFxe6X7V!q+c#-n9%{GoV8D;LO#um0{pa^XH$b{9G7Vj}C
zl03y=O9nJBQ$f^M$eF$fed7qlhzA^x({}0#Z4`~+rO<DqGJUDKpFTshW<liei}u3g
znQD|iR<7GW`6PvoZqyFl+z#aa)n9tnS-<C0ymuPIPUyXjQt5ZRXwB>7g0!4b9&a2!
NTL1m{eeVvI#orrX?vVfh

delta 1967
zcmaJ?TW=dh6!xss3y#tzX%T5~(xYvg+7eDZvv()7-q`Ed&HBQw(>5xlBz1(NG#7;w
zsGvktNJyxtEkgw_2&o7Jh=(*z-jD)90wJFIfP_R*`2{F%@K(;QQ+F!_mNj!`=A1KU
zzVDmadvB31u96#P_R&Of@^XSDnGB4jXfh=$H)jv*uP@9^AD^3CUOrx!U!GpNIP>!2
zaSlTN3X6kCl}AC8rl^)uG!ev1xmYRKRw9Q@O@x_wh={py+lHY3;NYMLwaMk_+Q0MY
zsbo@&M`B)rjANNqD+?lftU|F_q6n{N-LWgf|5auW16k8#1tKXcTc{>RCP189u8Y7|
z$&+Jt+05oj?uj_0DvoukP#$*^S=<dbV~LZO<~=wVP$?y`R8kiq^8cF=+DHpOv=fQn
zZ|~g^2jN^tV_;7|A-&w%`!jigcXejXwL|Iegr7q7^h+W9)y<BbUccItE<`+|*7&tE
zU98v4jvd}G-5H9hNeW)^St|#MuJZdmPql%fX<Y02O;C--{_a~5@&^AZy7=_wf*&-~
z?savHr7Q`S<CGoX{e6o9mH3Um!$fRc>wBgBnK*>TNGMFwPk8QAp&IETp%*=S?Qq^J
zGTeyfFOK;$T#v`vwPqm}$U2{mA3UN$#VJ>8w+b?YQLE~Y3OJM$7<Vn_blJ(ejoWd$
zThO$|FLWmnG@bv>J`yy8o5TC~yVAV_wpkp>ny#NF2ULR`R*QztuglSa$-QkMa=L##
zeDw~wo(}u{J87Y5yx9dLT_dM~-<1;wMgP=(wNc+sOAEr8@J3s`lZ4k!@jfMSG?pg<
zS^eI}eyj0qo)F)E>tk=eIs1No^;15t^pnH<J>`??wQ^^-K)%U$b?qtlhBvT|(AVis
zKPpecWNZCL3_TkrKJq?=>l<T2n4I-NUH|gr*lfKv<NJ5)3gPeE`YnD%RXQ$`^WDDB
z?K=<V`KCIsk|yV)4`)i{XiXsY*5`ulC*3Uf3g>(8JUAALDTWTmoQiE`Oq7Aq)CQ{d
z1Sm3vQYLRYE+|Y7E+DL}5XxFBprE!g<x<8(3Resj-0=~&>J&<&cx_}TRr6l9OgW2`
zs}kT+rR;(%%btl|6_6zcMXNXhl4`&)vsyJXd9<ZRTS$u1+FMdkj-HggOC~WD3Qda|
zm~h3*IA}dLZrUIvwU*-vU|8A1+{_51VEXpe@bWQL4aO)K<D--XCIwMqR0*7uAp*^F
z@+lom4aO@K%gLCoWjc;I0dmqngo;J0RL$9=C`%2pR>n3Rvsx&Z+#@NJtQzp(pXncf
z0b&Y7ye1Ne*f9-aLonq1hvFbfGM_MB?Z)f(V0S1aq-VRPcKHI~e;R+U1W91XVvqzz
z^~XwA9$TdbQr4uO>cKNojkOk3pF596Dr53(cS+u+g03*+qNM^#=|k2H=2=a85QIlQ
zss<T5)f7YmWl=;`we*3BJ$c|`9)uBx_%YBBA`xg3L4v8v*ys$zei1aBuxc~@rvX$7
zu|v<hi<1|o<0u6F*U;onMDFdj5T6@%bRV~^#(uxAh1YsEo9|Wh!|eyPc~!$?qX}`L
z*LxKy<9`evEl?yT$StB99AaUCA)Y@l(&gZ&vFq8p;R~_Kxc>yYz6=Ycs^#R&jD?Ps
z38yfcuR=^bH9dc68V2CZ^wPp>kXcw-Tv(c1o>`bjAPimg8qI5TY*6XgQ1Cv=@pz<E
Hup|EfW|imh


From cea05f990c936f741574f38c560e8285f9972614 Mon Sep 17 00:00:00 2001
From: rmkaplan <ron.kaplan@post.harvard.edu>
Date: Mon, 29 Sep 2025 20:55:42 -0700
Subject: [PATCH 2/8] symbol x type menu pops up when the symbol with different
 package qualifiers have different types

---
 sources/EDITINTERFACE       | 240 ++++++++++++++++++++----------------
 sources/EDITINTERFACE.DFASL | Bin 0 -> 17056 bytes
 2 files changed, 132 insertions(+), 108 deletions(-)
 create mode 100644 sources/EDITINTERFACE.DFASL

diff --git a/sources/EDITINTERFACE b/sources/EDITINTERFACE
index 1cdf0a604..b81556f05 100644
--- a/sources/EDITINTERFACE
+++ b/sources/EDITINTERFACE
@@ -1,14 +1,14 @@
 (DEFINE-FILE-INFO PACKAGE "INTERLISP" READTABLE "INTERLISP" BASE 10)
 
-
(FILECREATED "26-Sep-2025 15:26:08" 
-{DSK}<Users>kaplan>Local>medley3.5>working-medley>sources>EDITINTERFACE.;49
 48723  
+
(FILECREATED "29-Sep-2025 16:57:35" 
+{DSK}<Users>kaplan>Local>medley3.5>working-medley>sources>EDITINTERFACE.;51
 49305  
 
       :EDIT-BY rmk
 
-      :CHANGES-TO (FNS EDITDEF.FNS)
+      :CHANGES-TO (FUNCTIONS ED)
 
-      :PREVIOUS-DATE "13-Dec-2024 12:47:48" 
-{DSK}<Users>kaplan>Local>medley3.5>working-medley>sources>EDITINTERFACE.;47)
+      :PREVIOUS-DATE "29-Sep-2025 16:56:24" 
+{DSK}<Users>kaplan>Local>medley3.5>working-medley>sources>EDITINTERFACE.;50)
 
 
 (PRETTYCOMPRINT EDITINTERFACECOMS)
@@ -107,7 +107,8 @@
 (DEFGLOBALVAR XCL::ED-LAST-INFO
 NIL
    "used in ED to stash last call info so (ED NIL) will restart last edit")
 
-(CL:DEFUN ED
 (CL::NAME CL::OPTIONS)
                          (* ; "Edited 20-Dec-2023 00:06 by rmk")


+(CL:DEFUN ED
 (CL::NAME CL::OPTIONS)
                          (* ; "Edited 29-Sep-2025 16:57 by rmk")


+                                                             (* ; "Edited 20-Dec-2023 00:06 by rmk")


                                                              (* ; "Edited  5-Jul-88 16:03 by woz")

 
 (* ;;; "Standard Common Lisp editor entry.  CLtL say's ED does something reasonable when passed a pathname.  We coerce name into something that might be the name of something with an IL:FILES definition, & try to edit  that.  Then save call info in ED-LAST-INFO, so (ED) will start last edit over again.")

@@ -126,101 +127,124 @@
          (CL:SETQ CL::NAME (CAR XCL::ED-LAST-INFO))
          (CL:SETQ CL::OPTIONS (CL:APPEND (CDR XCL::ED-LAST-INFO)
                                      CL::OPTIONS]
-   (LET* ((CL::FROM-DISPLAY (OR (EQ CL::OPTIONS T)
-                                (CL:MEMBER :DISPLAY CL::OPTIONS)
-                                (CL:MEMBER 'DISPLAY CL::OPTIONS)))
-          (CL::GIVEN-TYPES (for
 CL::X TYPE inside
 CL::OPTIONS unless
 (EQ CL::X T)
-                              when
 (CL:SETQ TYPE (GETFILEPKGTYPE CL::X 'TYPES T CL::NAME))
-                              collect
 TYPE))
-          [CL::TYPES-WITH-DEFNS (TYPESOF CL::NAME CL::GIVEN-TYPES NIL
-                                       (CL:IF (OR (CL:MEMBER :CURRENT CL::OPTIONS)
-                                                  (CL:MEMBER 'CURRENT CL::OPTIONS))
-                                           'CURRENT
-                                           '?)
-                                       #'(LAMBDA (X)
-                                           (NEQ (GET X 'EDITDEF)
-                                                'NILL]
-          (CL::POSSIBLE-TYPES (COND
-                                 ([AND (NULL CL::GIVEN-TYPES)
-                                       (CL:SYMBOLP CL::NAME)
-                                       *ED-OFFERS-PROPERTY-LIST*
-                                       (find
 CL::X on
 (GETPROPLIST CL::NAME)
-                                          by
 (CDDR CL::X) suchthat
 (NULL (GET (CAR CL::X)
-                                                                              'PROPTYPE]
-
-                                 (* ;; "if we're supposed to offer PROPERTY-LIST as an edit type, and this name has a property list with other than system properties on it, then add IL:PROPERTY-LIST to the possible types.")

-
-                                  (CONS 'PROPERTY-LIST CL::TYPES-WITH-DEFNS))
-                                 (T CL::TYPES-WITH-DEFNS)))
-          (TYPE))
-         (CL:WHEN (CL:MEMBER 'PROPERTY-LIST CL::OPTIONS)
-
-             (* ;; 
-
          "this will allow PROPERTY-LIST to be specified as a fake filepkg type by the user (caller)")

-
-             (CL:SETQ CL::POSSIBLE-TYPES '(PROPERTY-LIST)))
-         [CL:SETQ TYPE (if
 (CL:MEMBER :NEW CL::OPTIONS)
-                           then
 
-                                (* ;; "if :NEW then install a blank definition first")

-
-                                (OR (INSTALL-PROTOTYPE-DEFN
 CL::NAME (OR CL::TYPES-WITH-DEFNS 
-                                                                         CL::GIVEN-TYPES)
-                                           :NEW)
-                                    (CL:RETURN-FROM ED NIL))
-                         elseif
 (CDR CL::POSSIBLE-TYPES)
-                           then
 
-                                (* ;; "Many types were found/given.  Ask the user which to use.")

-
-                                (if
 CL::FROM-DISPLAY
-                                    then
 (OR (MENU (create
 MENU
-                                                          ITEMS _ CL::POSSIBLE-TYPES
-                                                          TITLE _ (CL:FORMAT NIL 
-                                                                      "Edit which definition of ~S ?"
-                                                                         CL::NAME)))
-                                             (CL:RETURN-FROM ED NIL))
-                                  else
 (ASKUSER NIL (CAR CL::POSSIBLE-TYPES)
-                                              (CL:FORMAT NIL "Edit which ~A definition of ~S ? " 
-                                                     CL::POSSIBLE-TYPES CL::NAME)
-                                              CL::POSSIBLE-TYPES))
-                         elseif
 CL::POSSIBLE-TYPES
-                           then
 
-                                (* ;; "Exactly one type was found.")

-
-                                (CL:WHEN CL::FROM-DISPLAY    (* ; "prepare the prompt window")

-                                    (TERPRI PROMPTWINDOW))
-                                (CL:FORMAT (CL:IF CL::FROM-DISPLAY
-                                               PROMPTWINDOW
-                                               T)
-                                       "Editing ~A ~A ~S.~%%"
-                                       (CAR CL::POSSIBLE-TYPES)
-                                       (CL:IF (EQ (CAR CL::POSSIBLE-TYPES)
-                                                  'PROPERTY-LIST)
-                                           "of"
-                                           "definition of")
-                                       CL::NAME)
-                                (CAR CL::POSSIBLE-TYPES)
-                         elseif
 [for
 CL::N CL::NTYPES in
 (CL:FIND-ALL-SYMBOLS CL::NAME)
-                                   when
 (CL:SETQ CL::NTYPES (TYPESOF CL::N CL::GIVEN-TYPES))
-                                   collect
 (CONS CL::N CL::NTYPES)
-                                   finally
 (RETURN (if
 (CDR $$VAL)
-                                                       then
 NIL 
-                                                             (* ; "More than one name")

-                                                     elseif
 (CDDAR $$VAL)
-                                                       then
 NIL 
-                                                             (* ; "More than one type")

-                                                     else
    (* ; "One name one type")

-                                                          (CL:SETQ CL::NAME (CAAR $$VAL))
-                                                          (CADAR $$VAL]
-                         else
 
-                              (* ;; "No types were found.  Use the DefDefiner prototyping machinery.")

-
-                              (OR (INSTALL-PROTOTYPE-DEFN
 CL::NAME CL::GIVEN-TYPES)
-                                  (CL:RETURN-FROM ED NIL]
-         (CL:IF (EQ TYPE 'PROPERTY-LIST)
-             (EDITE
 (GETPROPLIST CL::NAME)
-                    NIL CL::NAME 'PROPLST NIL CL::OPTIONS)
-             (EDITDEF CL::NAME TYPE NIL NIL CL::OPTIONS))
-         (CL:RETURN-FROM ED CL::NAME)))
+   (LET*
+    ((CL::FROM-DISPLAY (OR (EQ CL::OPTIONS T)
+                           (CL:MEMBER :DISPLAY CL::OPTIONS)
+                           (CL:MEMBER 'DISPLAY CL::OPTIONS)))
+     (CL::GIVEN-TYPES (for
 CL::X TYPE inside
 CL::OPTIONS unless
 (EQ CL::X T)
+                         when
 (CL:SETQ TYPE (GETFILEPKGTYPE CL::X 'TYPES T CL::NAME)) collect
 TYPE))
+     [CL::TYPES-WITH-DEFNS (TYPESOF CL::NAME CL::GIVEN-TYPES NIL (CL:IF (OR (CL:MEMBER :CURRENT 
+                                                                                   CL::OPTIONS)
+                                                                            (CL:MEMBER 'CURRENT 
+                                                                                   CL::OPTIONS))
+                                                                     'CURRENT
+                                                                     '?)
+                                  #'(LAMBDA (X)
+                                      (NEQ (GET X 'EDITDEF)
+                                           'NILL]
+     (CL::POSSIBLE-TYPES (COND
+                            ([AND (NULL CL::GIVEN-TYPES)
+                                  (CL:SYMBOLP CL::NAME)
+                                  *ED-OFFERS-PROPERTY-LIST*
+                                  (find
 CL::X on
 (GETPROPLIST CL::NAME) by
 (CDDR CL::X)
+                                     suchthat
 (NULL (GET (CAR CL::X)
+                                                         'PROPTYPE]
+
+                             (* ;; "if we're supposed to offer PROPERTY-LIST as an edit type, and this name has a property list with other than system properties on it, then add IL:PROPERTY-LIST to the possible types.")

+
+                             (CONS 'PROPERTY-LIST CL::TYPES-WITH-DEFNS))
+                            (T CL::TYPES-WITH-DEFNS)))
+     (TYPE))
+    (CL:WHEN (CL:MEMBER 'PROPERTY-LIST CL::OPTIONS)
+
+        (* ;; 
+
        "this will allow PROPERTY-LIST to be specified as a fake filepkg type by the user (caller)")

+
+        (CL:SETQ CL::POSSIBLE-TYPES '(PROPERTY-LIST)))
+    [CL:UNLESS
+     (CL:SETQ
+      TYPE
+      (if
 (CL:MEMBER :NEW CL::OPTIONS)
+          then
 
+               (* ;; "if :NEW then install a blank definition first")

+
+               (OR (INSTALL-PROTOTYPE-DEFN
 CL::NAME (OR CL::TYPES-WITH-DEFNS CL::GIVEN-TYPES)
+                          :NEW)
+                   (CL:RETURN-FROM ED NIL))
+        elseif
 (CDR CL::POSSIBLE-TYPES)
+          then
 
+               (* ;; "Many types were found/given.  Ask the user which to use.")

+
+               (if
 CL::FROM-DISPLAY
+                   then
 (OR (MENU (create
 MENU
+                                         ITEMS _ CL::POSSIBLE-TYPES
+                                         TITLE _ (CL:FORMAT NIL "Edit which definition of ~S ?" 
+                                                        CL::NAME)))
+                            (CL:RETURN-FROM ED NIL))
+                 else
 (ASKUSER NIL (CAR CL::POSSIBLE-TYPES)
+                             (CL:FORMAT NIL "Edit which ~A definition of ~S ? " CL::POSSIBLE-TYPES 
+                                    CL::NAME)
+                             CL::POSSIBLE-TYPES))
+        elseif
 CL::POSSIBLE-TYPES
+          then
 
+               (* ;; "Exactly one type was found.")

+
+               (CL:WHEN CL::FROM-DISPLAY                     (* ; "prepare the prompt window")

+                   (TERPRI PROMPTWINDOW))
+               (CL:FORMAT (CL:IF CL::FROM-DISPLAY
+                              PROMPTWINDOW
+                              T)
+                      "Editing ~A ~A ~S.~%%"
+                      (CAR CL::POSSIBLE-TYPES)
+                      (CL:IF (EQ (CAR CL::POSSIBLE-TYPES)
+                                 'PROPERTY-LIST)
+                          "of"
+                          "definition of")
+                      CL::NAME)
+               (CAR CL::POSSIBLE-TYPES)
+        elseif

+        (for
 CL::N CHOICE CL::NTYPES in
 (CL:FIND-ALL-SYMBOLS CL::NAME)
+           when
 (CL:SETQ CL::NTYPES (TYPESOF CL::N CL::GIVEN-TYPES)) collect
 (CONS CL::N CL::NTYPES)
+           finally

+           (if
 (CDR $$VAL)
+               then
                                          (* ; 
+
                                                    "More than one name, each with at least one type")

+                    [SETQ CHOICE
+                     (MENU (create
 MENU
+                                  TITLE _ (CONCAT " Edit which definition?  ")
+                                  ITEMS _ (for
 I in
 $$VAL
+                                             join
 (for
 TY in
 (CDR I)
+                                                     collect
 (LIST (CONCAT (MKSTRING (CAR I)
+                                                                                  T)
+                                                                          "  " TY)
+                                                                   (LIST I TY]
+                    (SETQ CL::NAME (CAR CHOICE))
+                    (RETURN (CADR CHOICE))
+             elseif
 (CDDAR $$VAL)
+               then
                                          (* ; 
+
                            "One name with multiple types.  This may be handled by the ASKUSER above")

+                    [SETQ CHOICE (MENU (create
 MENU
+                                              TITLE _ (CONCAT "Which definition of "
+                                                             (MKSTRING (CAAR $$VAL)
+                                                                    T)
+                                                             " ?")
+                                              ITEMS _ (for
 TY in
 (CDADR $$VAL)
+                                                         collect
 (LIST TY (LIST (CAAR $$VAL)
+                                                                                TY]
+                    (SETQ CL::NAME (CAAR $$VAL))
+                    CHOICE
+             else
 (CL:SETQ CL::NAME (CAAR $$VAL))
+                  (CADAR $$VAL)))
+        else
 
+             (* ;; "No types were found.  Use the DefDefiner prototyping machinery.")

+
+             (OR (INSTALL-PROTOTYPE-DEFN
 CL::NAME CL::GIVEN-TYPES)
+                 (CL:RETURN-FROM ED NIL]
+    (CL:IF (EQ TYPE 'PROPERTY-LIST)
+        (EDITE
 (GETPROPLIST CL::NAME)
+               NIL CL::NAME 'PROPLST NIL CL::OPTIONS)
+        (EDITDEF CL::NAME TYPE NIL NIL CL::OPTIONS))
+    (CL:RETURN-FROM ED CL::NAME)))
 
 (CL:DEFUN INSTALL-PROTOTYPE-DEFN
 (NAME &REST ARGS)
 
@@ -964,11 +988,11 @@
 (ADDTOVAR LAMA
 )
 )
 (DECLARE%: DONTCOPY
-  (FILEMAP (NIL (4033 11389 (ED 4033 . 11389)) (11391 15367 (INSTALL-PROTOTYPE-DEFN 11391 . 15367)) (
-15368 32291 (EDITDEF.FNS 15378 . 16778) (EDITF 16780 . 17660) (EDITFB 17662 . 18510) (EDITFNS 18512 . 
-19832) (EDITLOADFNS? 19834 . 23710) (EDITMODE 23712 . 25722) (EDITP 25724 . 26235) (EDITV 26237 . 
-26876) (DC 26878 . 27559) (DF 27561 . 28603) (DP 28605 . 29689) (DV 29691 . 30263) (EDITPROP 30265 . 
-30484) (EF 30486 . 30815) (EP 30817 . 31000) (EV 31002 . 31181) (EDITE 31183 . 32061) (EDITL 32063 . 
-32289)) (32641 47958 (NEW/EDITDATE 32651 . 32873) (FIXEDITDATE 32875 . 41482) (EDITDATE? 41484 . 44512
-) (EDITDATE 44514 . 45961) (SETINITIALS 45963 . 47956)))))
+  (FILEMAP (NIL (4030 11971 (ED 4030 . 11971)) (11973 15949 (INSTALL-PROTOTYPE-DEFN 11973 . 15949)) (
+15950 32873 (EDITDEF.FNS 15960 . 17360) (EDITF 17362 . 18242) (EDITFB 18244 . 19092) (EDITFNS 19094 . 
+20414) (EDITLOADFNS? 20416 . 24292) (EDITMODE 24294 . 26304) (EDITP 26306 . 26817) (EDITV 26819 . 
+27458) (DC 27460 . 28141) (DF 28143 . 29185) (DP 29187 . 30271) (DV 30273 . 30845) (EDITPROP 30847 . 
+31066) (EF 31068 . 31397) (EP 31399 . 31582) (EV 31584 . 31763) (EDITE 31765 . 32643) (EDITL 32645 . 
+32871)) (33223 48540 (NEW/EDITDATE 33233 . 33455) (FIXEDITDATE 33457 . 42064) (EDITDATE? 42066 . 45094
+) (EDITDATE 45096 . 46543) (SETINITIALS 46545 . 48538)))))
 STOP
diff --git a/sources/EDITINTERFACE.DFASL b/sources/EDITINTERFACE.DFASL
new file mode 100644
index 0000000000000000000000000000000000000000..4797dd13bb59e5b5a337924dbc9a3594cb4a35df
GIT binary patch
literal 17056
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
Xyo?;CGCwhMJnMJ~cxw0Exbc4hWT<dg

literal 0
HcmV?d00001


From a296c4ece87edba7e3eba6b9801c06a9d0b3adde Mon Sep 17 00:00:00 2001
From: rmkaplan <ron.kaplan@post.harvard.edu>
Date: Tue, 30 Sep 2025 07:50:25 -0700
Subject: [PATCH 3/8] Fix RETURN

---
 sources/EDITINTERFACE       |  28 +++++++++++++---------------
 sources/EDITINTERFACE.DFASL | Bin 17056 -> 16981 bytes
 2 files changed, 13 insertions(+), 15 deletions(-)

diff --git a/sources/EDITINTERFACE b/sources/EDITINTERFACE
index b81556f05..067829779 100644
--- a/sources/EDITINTERFACE
+++ b/sources/EDITINTERFACE
@@ -1,14 +1,12 @@
 (DEFINE-FILE-INFO PACKAGE "INTERLISP" READTABLE "INTERLISP" BASE 10)
 
-
(FILECREATED "29-Sep-2025 16:57:35" 
-{DSK}<Users>kaplan>Local>medley3.5>working-medley>sources>EDITINTERFACE.;51
 49305  
+
(FILECREATED "30-Sep-2025 07:48:37" {WMEDLEY}<sources>EDITINTERFACE.;52
 49238  
 
       :EDIT-BY rmk
 
       :CHANGES-TO (FUNCTIONS ED)
 
-      :PREVIOUS-DATE "29-Sep-2025 16:56:24" 
-{DSK}<Users>kaplan>Local>medley3.5>working-medley>sources>EDITINTERFACE.;50)
+      :PREVIOUS-DATE "29-Sep-2025 16:57:35" {WMEDLEY}<sources>EDITINTERFACE.;51)
 
 
 (PRETTYCOMPRINT EDITINTERFACECOMS)
@@ -107,7 +105,7 @@
 (DEFGLOBALVAR XCL::ED-LAST-INFO
 NIL
    "used in ED to stash last call info so (ED NIL) will restart last edit")
 
-(CL:DEFUN ED
 (CL::NAME CL::OPTIONS)
                          (* ; "Edited 29-Sep-2025 16:57 by rmk")


+(CL:DEFUN ED
 (CL::NAME CL::OPTIONS)
                          (* ; "Edited 30-Sep-2025 07:47 by rmk")


                                                              (* ; "Edited 20-Dec-2023 00:06 by rmk")


                                                              (* ; "Edited  5-Jul-88 16:03 by woz")

 
@@ -203,7 +201,7 @@
                       CL::NAME)
                (CAR CL::POSSIBLE-TYPES)
         elseif

-        (for
 CL::N CHOICE CL::NTYPES in
 (CL:FIND-ALL-SYMBOLS CL::NAME)
+        [for
 CL::N CHOICE CL::NTYPES in
 (CL:FIND-ALL-SYMBOLS CL::NAME)
            when
 (CL:SETQ CL::NTYPES (TYPESOF CL::N CL::GIVEN-TYPES)) collect
 (CONS CL::N CL::NTYPES)
            finally

            (if
 (CDR $$VAL)
@@ -232,9 +230,9 @@
                                                          collect
 (LIST TY (LIST (CAAR $$VAL)
                                                                                 TY]
                     (SETQ CL::NAME (CAAR $$VAL))
-                    CHOICE
+                    (RETURN CHOICE)
              else
 (CL:SETQ CL::NAME (CAAR $$VAL))
-                  (CADAR $$VAL)))
+                  (RETURN (CADAR $$VAL]
         else
 
              (* ;; "No types were found.  Use the DefDefiner prototyping machinery.")

 
@@ -988,11 +986,11 @@
 (ADDTOVAR LAMA
 )
 )
 (DECLARE%: DONTCOPY
-  (FILEMAP (NIL (4030 11971 (ED 4030 . 11971)) (11973 15949 (INSTALL-PROTOTYPE-DEFN 11973 . 15949)) (
-15950 32873 (EDITDEF.FNS 15960 . 17360) (EDITF 17362 . 18242) (EDITFB 18244 . 19092) (EDITFNS 19094 . 
-20414) (EDITLOADFNS? 20416 . 24292) (EDITMODE 24294 . 26304) (EDITP 26306 . 26817) (EDITV 26819 . 
-27458) (DC 27460 . 28141) (DF 28143 . 29185) (DP 29187 . 30271) (DV 30273 . 30845) (EDITPROP 30847 . 
-31066) (EF 31068 . 31397) (EP 31399 . 31582) (EV 31584 . 31763) (EDITE 31765 . 32643) (EDITL 32645 . 
-32871)) (33223 48540 (NEW/EDITDATE 33233 . 33455) (FIXEDITDATE 33457 . 42064) (EDITDATE? 42066 . 45094
-) (EDITDATE 45096 . 46543) (SETINITIALS 46545 . 48538)))))
+  (FILEMAP (NIL (3948 11904 (ED 3948 . 11904)) (11906 15882 (INSTALL-PROTOTYPE-DEFN 11906 . 15882)) (
+15883 32806 (EDITDEF.FNS 15893 . 17293) (EDITF 17295 . 18175) (EDITFB 18177 . 19025) (EDITFNS 19027 . 
+20347) (EDITLOADFNS? 20349 . 24225) (EDITMODE 24227 . 26237) (EDITP 26239 . 26750) (EDITV 26752 . 
+27391) (DC 27393 . 28074) (DF 28076 . 29118) (DP 29120 . 30204) (DV 30206 . 30778) (EDITPROP 30780 . 
+30999) (EF 31001 . 31330) (EP 31332 . 31515) (EV 31517 . 31696) (EDITE 31698 . 32576) (EDITL 32578 . 
+32804)) (33156 48473 (NEW/EDITDATE 33166 . 33388) (FIXEDITDATE 33390 . 41997) (EDITDATE? 41999 . 45027
+) (EDITDATE 45029 . 46476) (SETINITIALS 46478 . 48471)))))
 STOP
diff --git a/sources/EDITINTERFACE.DFASL b/sources/EDITINTERFACE.DFASL
index 4797dd13bb59e5b5a337924dbc9a3594cb4a35df..d65f9b08d7c4d2756a14c8f6cdb2a4161bcc91f3 100644
GIT binary patch
delta 332
zcmZ3`%6PSfae_vDxUZ{=k85PDO>ur{QF3arovVvyh^JqOYml3xv#Xx9sS#H&SVkc&
zGbdFcxhOTUBsE3B*g!WpwLsU%z{pg=z}(8j!phj3%gr&^2US@}X=-swVx<mHy#i2u
zNosCVYLNm+myQBZm!%bxf#JrBd%3KznK!jZxtg%^Hh<v$%E;)r`5EtYM#l2Vb^LjZ
z9FyPjOEJEk%pu^wxMs7bz+^@)MkY^2CZ<Ij89q#YCisfiU!>EMkuiy3KTwo$@(rOP
z3CkH%d)PsKcX4%VVqjp^nVAlv7&a#f`!fovfMf%L`~!S~LqNi!n-7UB7G^ZroTgzV
F1pxVfWW@jg

delta 366
zcmccG!nmN7ae{`SOR#sXO=xjyQL$ZiVnI$~o}EvAa$=5MZfZ(SYNfHBsa<(~QFdlt
zx-LY-Zla+?f+1IMerZv1szO?3PO3t3QEFmIYKnr9rEYL)fv%B(k*R{AnU$%zm9Z(8
zn`5vKsxsgFyp+UB9iVarpz@N`+@#bZ1&}5kxUP*W_i}k+Gj3{+cQrXKW;EQqfcq;W
zqs``Nywe#Oize&w=P@!*p35)A_+s)7eh0?on}708X5?b{>&eK(v}hy4yUEi8Uvad0
zGBPGH?Dw49D^w(5GGl5FyQ_<5h>NRR69WUQ`pk47#qxWzxUfH?pgc%6Ajm(!CpZKo
SE3mm-WU(-#!DeX<D=7d*XLX?f


From 46c3c0898ff22ae5de8e7232ccc9bf1eb14c5e40 Mon Sep 17 00:00:00 2001
From: rmkaplan <ron.kaplan@post.harvard.edu>
Date: Tue, 30 Sep 2025 11:18:57 -0700
Subject: [PATCH 4/8] Fixed the menu case of one symbol with multiple types

---
 sources/EDITINTERFACE       |  31 +++++++++++++++----------------
 sources/EDITINTERFACE.DFASL | Bin 16981 -> 17049 bytes
 2 files changed, 15 insertions(+), 16 deletions(-)

diff --git a/sources/EDITINTERFACE b/sources/EDITINTERFACE
index 067829779..225d350f4 100644
--- a/sources/EDITINTERFACE
+++ b/sources/EDITINTERFACE
@@ -1,12 +1,14 @@
 (DEFINE-FILE-INFO PACKAGE "INTERLISP" READTABLE "INTERLISP" BASE 10)
 
-
(FILECREATED "30-Sep-2025 07:48:37" {WMEDLEY}<sources>EDITINTERFACE.;52
 49238  
+
(FILECREATED "30-Sep-2025 11:17:32" 
+{DSK}<Users>kaplan>Local>medley3.5>working-medley>sources>EDITINTERFACE.;54
 49084  
 
       :EDIT-BY rmk
 
       :CHANGES-TO (FUNCTIONS ED)
 
-      :PREVIOUS-DATE "29-Sep-2025 16:57:35" {WMEDLEY}<sources>EDITINTERFACE.;51)
+      :PREVIOUS-DATE "30-Sep-2025 08:25:56" 
+{DSK}<Users>kaplan>Local>medley3.5>working-medley>sources>EDITINTERFACE.;53)
 
 
 (PRETTYCOMPRINT EDITINTERFACECOMS)
@@ -105,7 +107,7 @@
 (DEFGLOBALVAR XCL::ED-LAST-INFO
 NIL
    "used in ED to stash last call info so (ED NIL) will restart last edit")
 
-(CL:DEFUN ED
 (CL::NAME CL::OPTIONS)
                          (* ; "Edited 30-Sep-2025 07:47 by rmk")


+(CL:DEFUN ED
 (CL::NAME CL::OPTIONS)
                          (* ; "Edited 30-Sep-2025 11:12 by rmk")


                                                              (* ; "Edited 20-Dec-2023 00:06 by rmk")


                                                              (* ; "Edited  5-Jul-88 16:03 by woz")

 
@@ -219,17 +221,14 @@
                     (SETQ CL::NAME (CAR CHOICE))
                     (RETURN (CADR CHOICE))
              elseif
 (CDDAR $$VAL)
-               then
                                          (* ; 
-
                            "One name with multiple types.  This may be handled by the ASKUSER above")

+               then
                                          (* ; "One name with multiple types.  ")

                     [SETQ CHOICE (MENU (create
 MENU
                                               TITLE _ (CONCAT "Which definition of "
                                                              (MKSTRING (CAAR $$VAL)
                                                                     T)
                                                              " ?")
-                                              ITEMS _ (for
 TY in
 (CDADR $$VAL)
-                                                         collect
 (LIST TY (LIST (CAAR $$VAL)
-                                                                                TY]
-                    (SETQ CL::NAME (CAAR $$VAL))
+                                              ITEMS _ (for
 TY in
 (CDAR $$VAL) collect
 TY]
+                    (CL:SETQ CL::NAME (CAAR $$VAL))
                     (RETURN CHOICE)
              else
 (CL:SETQ CL::NAME (CAAR $$VAL))
                   (RETURN (CADAR $$VAL]
@@ -986,11 +985,11 @@
 (ADDTOVAR LAMA
 )
 )
 (DECLARE%: DONTCOPY
-  (FILEMAP (NIL (3948 11904 (ED 3948 . 11904)) (11906 15882 (INSTALL-PROTOTYPE-DEFN 11906 . 15882)) (
-15883 32806 (EDITDEF.FNS 15893 . 17293) (EDITF 17295 . 18175) (EDITFB 18177 . 19025) (EDITFNS 19027 . 
-20347) (EDITLOADFNS? 20349 . 24225) (EDITMODE 24227 . 26237) (EDITP 26239 . 26750) (EDITV 26752 . 
-27391) (DC 27393 . 28074) (DF 28076 . 29118) (DP 29120 . 30204) (DV 30206 . 30778) (EDITPROP 30780 . 
-30999) (EF 31001 . 31330) (EP 31332 . 31515) (EV 31517 . 31696) (EDITE 31698 . 32576) (EDITL 32578 . 
-32804)) (33156 48473 (NEW/EDITDATE 33166 . 33388) (FIXEDITDATE 33390 . 41997) (EDITDATE? 41999 . 45027
-) (EDITDATE 45029 . 46476) (SETINITIALS 46478 . 48471)))))
+  (FILEMAP (NIL (4030 11750 (ED 4030 . 11750)) (11752 15728 (INSTALL-PROTOTYPE-DEFN 11752 . 15728)) (
+15729 32652 (EDITDEF.FNS 15739 . 17139) (EDITF 17141 . 18021) (EDITFB 18023 . 18871) (EDITFNS 18873 . 
+20193) (EDITLOADFNS? 20195 . 24071) (EDITMODE 24073 . 26083) (EDITP 26085 . 26596) (EDITV 26598 . 
+27237) (DC 27239 . 27920) (DF 27922 . 28964) (DP 28966 . 30050) (DV 30052 . 30624) (EDITPROP 30626 . 
+30845) (EF 30847 . 31176) (EP 31178 . 31361) (EV 31363 . 31542) (EDITE 31544 . 32422) (EDITL 32424 . 
+32650)) (33002 48319 (NEW/EDITDATE 33012 . 33234) (FIXEDITDATE 33236 . 41843) (EDITDATE? 41845 . 44873
+) (EDITDATE 44875 . 46322) (SETINITIALS 46324 . 48317)))))
 STOP
diff --git a/sources/EDITINTERFACE.DFASL b/sources/EDITINTERFACE.DFASL
index d65f9b08d7c4d2756a14c8f6cdb2a4161bcc91f3..601d748a11983b822210105662103a7a2f14726c 100644
GIT binary patch
delta 326
zcmccG!Z@>)ae{`SOR#sXO=xjyQL$ZiVnI$~o}EvAa$=5MZfZ(SYNfHBsa<(~QFdlt
zx-LY-Zla+Cqsc@sMGiwlD?@WDW21@1`f&Efl_$AuVG>h&ysODGe)9tEuZ)Z)o2T(k
zXJpKptjC|r#PoaeTz)CW2a|X3J21}Q{F8q&BNxM0PevxDMH?9&Po5@dHu<ceJc}x0
zywc=9g7S=4Cd&vtme-jvwTIo+#WTdk)vbwvfmMEHI*?-dJTnADUDzxq?7^rm4pI~l
w<R9P@3=(GL0P=Z3eAl3mNL?RKuqeyY$-N?yj8ir*7by~EGBwyNtzjhv0OWCM2mk;8

delta 328
zcmbQ)%6PSfae{_-xUZ{=k85PDO>ur{QF3arovVvyh^JqOYml3xv#Xx9sS#H&SVkc&
zGbdFcxhOTUBsE3B*g!WpwLsU%z{pg=z}(8j!phiu;%t3(Ak)&yz;NTGlU#Z*@u@w^
z)r76t{E_=BBctQy=e*My8OtZv^XD=#b4-56FU9zFGN*t8<C@K00+SiJ7@0g7nV1%B
zWcV=oxu6*%(_~p8c>zPlcqM-sMn-?73@Irfn(QDX&v;^Tg3x1m%NbL9*g<}Badm5A
zU|`jmnGT{DW`+PMmb;siggqG5RX~aYg8Tz~f<eNpqCh?`i0>K{5~=Is2^MA9H2I>4
VB;&%(uSJT4nT$*}$7@(g0RXSWVp{+J


From 8a6a382a10cf2e29161df084a7c4919fb141572a Mon Sep 17 00:00:00 2001
From: rmkaplan <ron.kaplan@post.harvard.edu>
Date: Wed, 1 Oct 2025 23:18:27 -0700
Subject: [PATCH 5/8] Declare the OPTIONS argument of ED as &OPTIONAL

---
 sources/EDITINTERFACE       |  25 +++++++++++++------------
 sources/EDITINTERFACE.DFASL | Bin 17049 -> 17054 bytes
 2 files changed, 13 insertions(+), 12 deletions(-)

diff --git a/sources/EDITINTERFACE b/sources/EDITINTERFACE
index 225d350f4..e68c06e3c 100644
--- a/sources/EDITINTERFACE
+++ b/sources/EDITINTERFACE
@@ -1,14 +1,14 @@
 (DEFINE-FILE-INFO PACKAGE "INTERLISP" READTABLE "INTERLISP" BASE 10)
 
-
(FILECREATED "30-Sep-2025 11:17:32" 
-{DSK}<Users>kaplan>Local>medley3.5>working-medley>sources>EDITINTERFACE.;54
 49084  
+
(FILECREATED " 1-Oct-2025 23:17:21" 
+{DSK}<Users>kaplan>Local>medley3.5>working-medley>sources>EDITINTERFACE.;55
 49193  
 
       :EDIT-BY rmk
 
       :CHANGES-TO (FUNCTIONS ED)
 
-      :PREVIOUS-DATE "30-Sep-2025 08:25:56" 
-{DSK}<Users>kaplan>Local>medley3.5>working-medley>sources>EDITINTERFACE.;53)
+      :PREVIOUS-DATE "30-Sep-2025 11:17:32" 
+{DSK}<Users>kaplan>Local>medley3.5>working-medley>sources>EDITINTERFACE.;54)
 
 
 (PRETTYCOMPRINT EDITINTERFACECOMS)
@@ -107,7 +107,8 @@
 (DEFGLOBALVAR XCL::ED-LAST-INFO
 NIL
    "used in ED to stash last call info so (ED NIL) will restart last edit")
 
-(CL:DEFUN ED
 (CL::NAME CL::OPTIONS)
                          (* ; "Edited 30-Sep-2025 11:12 by rmk")


+(CL:DEFUN ED
 (CL::NAME &OPTIONAL (CL::OPTIONS NIL))
          (* ; "Edited  1-Oct-2025 23:17 by rmk")


+                                                             (* ; "Edited 30-Sep-2025 12:49 by rmk")


                                                              (* ; "Edited 20-Dec-2023 00:06 by rmk")


                                                              (* ; "Edited  5-Jul-88 16:03 by woz")

 
@@ -985,11 +986,11 @@
 (ADDTOVAR LAMA
 )
 )
 (DECLARE%: DONTCOPY
-  (FILEMAP (NIL (4030 11750 (ED 4030 . 11750)) (11752 15728 (INSTALL-PROTOTYPE-DEFN 11752 . 15728)) (
-15729 32652 (EDITDEF.FNS 15739 . 17139) (EDITF 17141 . 18021) (EDITFB 18023 . 18871) (EDITFNS 18873 . 
-20193) (EDITLOADFNS? 20195 . 24071) (EDITMODE 24073 . 26083) (EDITP 26085 . 26596) (EDITV 26598 . 
-27237) (DC 27239 . 27920) (DF 27922 . 28964) (DP 28966 . 30050) (DV 30052 . 30624) (EDITPROP 30626 . 
-30845) (EF 30847 . 31176) (EP 31178 . 31361) (EV 31363 . 31542) (EDITE 31544 . 32422) (EDITL 32424 . 
-32650)) (33002 48319 (NEW/EDITDATE 33012 . 33234) (FIXEDITDATE 33236 . 41843) (EDITDATE? 41845 . 44873
-) (EDITDATE 44875 . 46322) (SETINITIALS 46324 . 48317)))))
+  (FILEMAP (NIL (4030 11859 (ED 4030 . 11859)) (11861 15837 (INSTALL-PROTOTYPE-DEFN 11861 . 15837)) (
+15838 32761 (EDITDEF.FNS 15848 . 17248) (EDITF 17250 . 18130) (EDITFB 18132 . 18980) (EDITFNS 18982 . 
+20302) (EDITLOADFNS? 20304 . 24180) (EDITMODE 24182 . 26192) (EDITP 26194 . 26705) (EDITV 26707 . 
+27346) (DC 27348 . 28029) (DF 28031 . 29073) (DP 29075 . 30159) (DV 30161 . 30733) (EDITPROP 30735 . 
+30954) (EF 30956 . 31285) (EP 31287 . 31470) (EV 31472 . 31651) (EDITE 31653 . 32531) (EDITL 32533 . 
+32759)) (33111 48428 (NEW/EDITDATE 33121 . 33343) (FIXEDITDATE 33345 . 41952) (EDITDATE? 41954 . 44982
+) (EDITDATE 44984 . 46431) (SETINITIALS 46433 . 48426)))))
 STOP
diff --git a/sources/EDITINTERFACE.DFASL b/sources/EDITINTERFACE.DFASL
index 601d748a11983b822210105662103a7a2f14726c..ffd51787b47765edbde33d166eafe4503f639293 100644
GIT binary patch
delta 839
zcmZvZT}YEr7{~YQ9i_9n(K%$Rz0PP`^J{ZUXQhl%(cBhIk|Juhy-^^FYeoiLC<uk4
ztb?%k#v;lBZ;S&GfpjrqThtUUTCU;1y69@r5P~4+oM({)-JJ7#{^$8W9~^la=BHtH
zEZ|i8N5{iKNxXDrSQ3L_X(%FvMA6pZ3q~63&330~Z)vx+w%cv$ZnwYx-?Tv~G$LIM
z4NcUGHjx=dFG^vNo9h3%p06#dwf`$O7d>&$)CW%bz2fjrjS!2fylzid>~6IDfbZl$
zug~l5CyvTMQ*uh75T=-}>UaAGc+e`dQ<36mMSROp`M#u*c;%2K%>?*`0=L5}L{#s{
zyav>u@{V|_%#bG6sva6YGFezed7Yv1HDZ=y7h;CAX$-zk+?_>%J0Oj?&harKcfjq~
zY*g@e4RXGLa*pFLVuoX&gk(YEggnV<ys$~E)mxAuqW1U>e2kMZZ5<@&oOVfoB<a?<
z*{HX4dl@h2L<e6-k;F{Im)rPc8>1zhC|%^I&c%v2^cF3jUb%wuI>#BrEQ#n%yKuA5
zr8n|a-&vOJ#vn%v`m_?h(PhISfH>I__d}Z2)Vcr?#Bc1_v*D0Wo8?n_%-$dmj9;qb
zoZ%QM#mVxU2rE>sd!qsexnQ=k#b?ZZRxNMVGX7z1fmLF)=-8Y+mb0)*A6a}#h|{9A
z7vKXq(okT{tc@KN`Ezog2g~J2q;Uf_slQ1LkR#`tze0xg*y_Ph>V8me`_o^E9}j1C
zW1OJ(?FGKbq+^MlcIP<j^UOIfu%O2^0x9~!b(sa!aCD8Q6+292seNco(b~@I!fy|5
B5zYVr

delta 847
zcmZvYT}YEr7{~W)LORU|KVEE`y?&q@PTOZPquEG>=|04bwCKX6Z}eebOQQu52?o(B
z;~;Hai~_}r6<OydiU@*q5pxt|&EY`m!YhpkBq-{fXOIQmocH(q&-4GE_jzJt5FLZ@
zGXaazcWNX!Ac=>M4oTubPznr7gQD5c=#x%2nhYkZXf(DMn_J8#WrxG(`nSzLBAp!!
zg!HUmWc|a^i9=FQ<SzXm+oQM7mBRn>Cc<5}>N~+gzZCA;lrN8j^E?iBJK0mx4|C*R
zi6A6KWimxWl%2BI?2soB6C_m<&?T7wKT(+D_!JS<8&N-3Do}Yt_LpiQNk&WWUi!df
zMI7ai4COBn(;V9o7dToY6XBxn9<RIG-|O_Wd3(92#rs8uu!zXBU>=cY!6agu<JHJ`
zSm9~sKDdB#hU3syWc~*9=a4)uvqF}vlzCv8G?#ya1)>+)Hb-uT3+lYxey7*taFKID
z4b0Lz!i<8grAy^t!(3Ns7{^tjg%2!CU>f3+4V>D*a1KMc5Ba6Cu@IYDC-5ocDU@*|
z*AUYrq^>W*2|wlT$bEHdak>MG%oc8nlZTorx=k}JhgJG=`%Zv0@?ETjB(1En0nC!V
zYJ2gLCAv==?NOs|iA+|1E??sedr|p%x!@wgJdM@7$^!!#)Hbk9jB9-rfAzs}^c=(1
zW%5I7h7>XARBQ&9?f|6dw9YGsHM-v51b9yzjjQZ=LzBHQdobGRMpu@EnzFD=`*tV+
zGGxH80t?h-)bqa%nKW#_w@s_OxMG=MXR~#L<vp;*6s&OBPC|k{vmIdtt=;{Ox2@aj
P^AnXAouGBC=M}#J5LgvJ


From f91e993c3a97ad4a5319553a1a7a0c582d1c2e0d Mon Sep 17 00:00:00 2001
From: rmkaplan <ron.kaplan@post.harvard.edu>
Date: Wed, 1 Oct 2025 23:21:51 -0700
Subject: [PATCH 6/8] (IL:MKLIST OPTIONS) leaves NIL as NIL

---
 sources/EDITINTERFACE       |  28 +++++++++++++---------------
 sources/EDITINTERFACE.DFASL | Bin 17054 -> 17076 bytes
 2 files changed, 13 insertions(+), 15 deletions(-)

diff --git a/sources/EDITINTERFACE b/sources/EDITINTERFACE
index e68c06e3c..af0fdb01c 100644
--- a/sources/EDITINTERFACE
+++ b/sources/EDITINTERFACE
@@ -1,14 +1,14 @@
 (DEFINE-FILE-INFO PACKAGE "INTERLISP" READTABLE "INTERLISP" BASE 10)
 
-
(FILECREATED " 1-Oct-2025 23:17:21" 
-{DSK}<Users>kaplan>Local>medley3.5>working-medley>sources>EDITINTERFACE.;55
 49193  
+
(FILECREATED " 1-Oct-2025 23:20:37" 
+{DSK}<Users>kaplan>Local>medley3.5>working-medley>sources>EDITINTERFACE.;56
 48927  
 
       :EDIT-BY rmk
 
       :CHANGES-TO (FUNCTIONS ED)
 
-      :PREVIOUS-DATE "30-Sep-2025 11:17:32" 
-{DSK}<Users>kaplan>Local>medley3.5>working-medley>sources>EDITINTERFACE.;54)
+      :PREVIOUS-DATE " 1-Oct-2025 23:17:21" 
+{DSK}<Users>kaplan>Local>medley3.5>working-medley>sources>EDITINTERFACE.;55)
 
 
 (PRETTYCOMPRINT EDITINTERFACECOMS)
@@ -107,13 +107,11 @@
 (DEFGLOBALVAR XCL::ED-LAST-INFO
 NIL
    "used in ED to stash last call info so (ED NIL) will restart last edit")
 
-(CL:DEFUN ED
 (CL::NAME &OPTIONAL (CL::OPTIONS NIL))
          (* ; "Edited  1-Oct-2025 23:17 by rmk")


+(CL:DEFUN ED
 (CL::NAME &OPTIONAL (CL::OPTIONS NIL))
          (* ; "Edited  1-Oct-2025 23:19 by rmk")


                                                              (* ; "Edited 30-Sep-2025 12:49 by rmk")


                                                              (* ; "Edited 20-Dec-2023 00:06 by rmk")


                                                              (* ; "Edited  5-Jul-88 16:03 by woz")

-
-(* ;;; "Standard Common Lisp editor entry.  CLtL say's ED does something reasonable when passed a pathname.  We coerce name into something that might be the name of something with an IL:FILES definition, & try to edit  that.  Then save call info in ED-LAST-INFO, so (ED) will start last edit over again.")

-
+   (CL:SETQ CL::OPTIONS (MKLIST CL::OPTIONS))
    (CL:UNLESS (CL:LISTP CL::OPTIONS)
        (CL:SETQ CL::OPTIONS (LIST CL::OPTIONS)))
    (CL:WHEN (CL:PATHNAMEP CL::NAME)
@@ -986,11 +984,11 @@
 (ADDTOVAR LAMA
 )
 )
 (DECLARE%: DONTCOPY
-  (FILEMAP (NIL (4030 11859 (ED 4030 . 11859)) (11861 15837 (INSTALL-PROTOTYPE-DEFN 11861 . 15837)) (
-15838 32761 (EDITDEF.FNS 15848 . 17248) (EDITF 17250 . 18130) (EDITFB 18132 . 18980) (EDITFNS 18982 . 
-20302) (EDITLOADFNS? 20304 . 24180) (EDITMODE 24182 . 26192) (EDITP 26194 . 26705) (EDITV 26707 . 
-27346) (DC 27348 . 28029) (DF 28031 . 29073) (DP 29075 . 30159) (DV 30161 . 30733) (EDITPROP 30735 . 
-30954) (EF 30956 . 31285) (EP 31287 . 31470) (EV 31472 . 31651) (EDITE 31653 . 32531) (EDITL 32533 . 
-32759)) (33111 48428 (NEW/EDITDATE 33121 . 33343) (FIXEDITDATE 33345 . 41952) (EDITDATE? 41954 . 44982
-) (EDITDATE 44984 . 46431) (SETINITIALS 46433 . 48426)))))
+  (FILEMAP (NIL (4030 11593 (ED 4030 . 11593)) (11595 15571 (INSTALL-PROTOTYPE-DEFN 11595 . 15571)) (
+15572 32495 (EDITDEF.FNS 15582 . 16982) (EDITF 16984 . 17864) (EDITFB 17866 . 18714) (EDITFNS 18716 . 
+20036) (EDITLOADFNS? 20038 . 23914) (EDITMODE 23916 . 25926) (EDITP 25928 . 26439) (EDITV 26441 . 
+27080) (DC 27082 . 27763) (DF 27765 . 28807) (DP 28809 . 29893) (DV 29895 . 30467) (EDITPROP 30469 . 
+30688) (EF 30690 . 31019) (EP 31021 . 31204) (EV 31206 . 31385) (EDITE 31387 . 32265) (EDITL 32267 . 
+32493)) (32845 48162 (NEW/EDITDATE 32855 . 33077) (FIXEDITDATE 33079 . 41686) (EDITDATE? 41688 . 44716
+) (EDITDATE 44718 . 46165) (SETINITIALS 46167 . 48160)))))
 STOP
diff --git a/sources/EDITINTERFACE.DFASL b/sources/EDITINTERFACE.DFASL
index ffd51787b47765edbde33d166eafe4503f639293..72acc7a158dc788fb6e74d4e71d75cc766e80122 100644
GIT binary patch
delta 983
zcmY+B&rj1}7{~jz9ZX=d18jmOj(`kfW<(4MCX&*<gR-`J({{lb4@METkbu7q#><oh
zgGm!v8e$v8gZ>3NFM9NZ1WhzSMNktjdi26k<MX^D8ZUi6@Av!s>hnIFC(q`|;$_lb
zxzZIndStNgc;$X?4W7JRYY1~`$<0=hW2C?OvvHe5hZX5`W%Rb<DaH1i#q(nId!!gD
z5Bf`PJxyy)nr7w%A(RTH@F0N$hx`Rx*`Q_~FNfe#r{+vm;a&$^!$#J2EX^DNU)m1f
zE36<c`gdJfS8NQFDA!*h4scur6gN4RQ5KhR2&cfPox>r-tB@YeXl6R4=z7X77{fW;
zMq>($x=hY8_z2=joXDXTvov%MVj0EG=51=>y_2_igV@LsXCo_rRq`Mx<Afy1r8Pid
z3u^2hp-x8ADa(%FP$(~8V}&tlrZ3g<2Ow~lsTee)Q9a!Uex$aFRGz7dO%H?8fPPKw
zfGVK_I3TlfOy`>k#r)PKH-ZASoI*<1xGYz_&n<1`N7z8s;pcJ&;~Q@VrBRmfJ#em0
zC@HP-X+9!8=ePkVzUKG|(dPI8QHA`bTDfspZf+dKe(rAqk{=wg7TF5Qa0na7Pq~c6
z$UT42l}w6>WP!_Dh&MQ54>I!)9cUNEpW9g?iGe_dFe(aEujVa_n*0I6JnJi1!Y^on
zR(Z!0*12~Fy~jZk4<AF)n$2{jfcIMgyB@HKfSnDP0hL4ec(%&(zIDSpgqh-u;#)L9
zxZLf#VgkpI_xNthc(HV$n3%XYS(+(bE6vU%W+xNiNzJD)3{iaVyKM=N#9Na?HQ}7^
zM*hpds51~hJBc*ry@<7wecpPkhrIND$GV#5e2?&P_>T5_z42)>?JdWTk-gP-@k*4O
Ks7~|@w*LXw1R})%

delta 912
zcmYL`OK1~O6ozvrlQt$zZ80W&AV#b-Py<F13PmVmawm?N$7N<>$wDZC52_$OR@np!
zT~vZi7y}suSGsal(v=7<tx`i>X{%6hqu`=~bR!6!bAog;_dEYT=iL9^yRpKat+3`j
zmT%pk3T0>K&SzUsvwc|qxD^SL)NYhp)0bJk`zw0Dq@2<{h}{a+&vx34L0;6{B3G9K
zfzV0+CM@!A-^FDcT-o4e1&b3<3=}N0ppbVA%CJ#(Tw60s;0M3^@C|GtE_c=%vaUGz
zV{n%AcZf5D?*XL`gmsjqH4Nca1$QhAAzg>|5mhsb8AaDKPSv<*=?)rIFa}i1HYkFW
z!9*^%g{`4GiDML}TyeOK^>Nyw2gv>sVm9{bP<`yzF(Df#X$vsWgBimm?y8#3MY)8b
zYPhK)1UHM<`n@yo(-BiKxT<lzcn17f{~9tCQBWM70wsceUp)nbLrDxLY)j~LE1@vd
zF)<1Px7}(+*GQIMc>D43`V-uspu@o|L(pwAP@-}W-vTq8hLOS7l;$(yOTryM=?&p7
zA}9QWn1}wM{<sCWSZe{rH2Gfu*)Ac@Vm-eOOJE22ImtMTt#+D?pvke3)kyw|c!v=8
zV2g*S!ggUiErvx8kIUwfB%r}U#kRSLCky<cu06zk*aEG^|K3~jR?%zw)3`jsUy7O|
zbfx;h7fZgl;tSIk^Ds4pkLKj5=i3;(L0Bm6C47e=XqCr04Jm~Y<cPPFn2esoIt8_~
z=`|B6W_#<2cvJ`V?hRBgc-x5yHthXOq}hfSPfi_u*zwrm8ArWR@;1Bbb(1+3>;6c#
MMp&*}OV3UG0~?$SYXATM


From 60a6f0aaeb85445b8884bdbc30e651de623f42c9 Mon Sep 17 00:00:00 2001
From: rmkaplan <ron.kaplan@post.harvard.edu>
Date: Thu, 2 Oct 2025 10:43:49 -0700
Subject: [PATCH 7/8] Fixed the FNS LAMBDA case

---
 sources/EDITINTERFACE       |  32 +++++++++++++++++---------------
 sources/EDITINTERFACE.DFASL | Bin 17076 -> 17079 bytes
 2 files changed, 17 insertions(+), 15 deletions(-)

diff --git a/sources/EDITINTERFACE b/sources/EDITINTERFACE
index af0fdb01c..6b5204b69 100644
--- a/sources/EDITINTERFACE
+++ b/sources/EDITINTERFACE
@@ -1,14 +1,15 @@
 (DEFINE-FILE-INFO PACKAGE "INTERLISP" READTABLE "INTERLISP" BASE 10)
 
-
(FILECREATED " 1-Oct-2025 23:20:37" 
-{DSK}<Users>kaplan>Local>medley3.5>working-medley>sources>EDITINTERFACE.;56
 48927  
+
(FILECREATED " 2-Oct-2025 10:43:08" 
+{DSK}<Users>kaplan>Local>medley3.5>working-medley>sources>EDITINTERFACE.;57
 49004  
 
       :EDIT-BY rmk
 
-      :CHANGES-TO (FUNCTIONS ED)
+      :CHANGES-TO (VARS EDITINTERFACECOMS)
+                  (FUNCTIONS ED)
 
-      :PREVIOUS-DATE " 1-Oct-2025 23:17:21" 
-{DSK}<Users>kaplan>Local>medley3.5>working-medley>sources>EDITINTERFACE.;55)
+      :PREVIOUS-DATE " 1-Oct-2025 23:20:37" 
+{DSK}<Users>kaplan>Local>medley3.5>working-medley>sources>EDITINTERFACE.;56)
 
 
 (PRETTYCOMPRINT EDITINTERFACECOMS)
@@ -107,7 +108,7 @@
 (DEFGLOBALVAR XCL::ED-LAST-INFO
 NIL
    "used in ED to stash last call info so (ED NIL) will restart last edit")
 
-(CL:DEFUN ED
 (CL::NAME &OPTIONAL (CL::OPTIONS NIL))
          (* ; "Edited  1-Oct-2025 23:19 by rmk")


+(CL:DEFUN ED
 (CL::NAME &OPTIONAL (CL::OPTIONS NIL))
          (* ; "Edited  2-Oct-2025 10:42 by rmk")


                                                              (* ; "Edited 30-Sep-2025 12:49 by rmk")


                                                              (* ; "Edited 20-Dec-2023 00:06 by rmk")


                                                              (* ; "Edited  5-Jul-88 16:03 by woz")

@@ -229,8 +230,9 @@
                                               ITEMS _ (for
 TY in
 (CDAR $$VAL) collect
 TY]
                     (CL:SETQ CL::NAME (CAAR $$VAL))
                     (RETURN CHOICE)
-             else
 (CL:SETQ CL::NAME (CAAR $$VAL))
-                  (RETURN (CADAR $$VAL]
+             elseif
 $$VAL
+               then
 (CL:SETQ CL::NAME (CAAR $$VAL))
+                    (RETURN (CADAR $$VAL]
         else
 
              (* ;; "No types were found.  Use the DefDefiner prototyping machinery.")

 
@@ -984,11 +986,11 @@
 (ADDTOVAR LAMA
 )
 )
 (DECLARE%: DONTCOPY
-  (FILEMAP (NIL (4030 11593 (ED 4030 . 11593)) (11595 15571 (INSTALL-PROTOTYPE-DEFN 11595 . 15571)) (
-15572 32495 (EDITDEF.FNS 15582 . 16982) (EDITF 16984 . 17864) (EDITFB 17866 . 18714) (EDITFNS 18716 . 
-20036) (EDITLOADFNS? 20038 . 23914) (EDITMODE 23916 . 25926) (EDITP 25928 . 26439) (EDITV 26441 . 
-27080) (DC 27082 . 27763) (DF 27765 . 28807) (DP 28809 . 29893) (DV 29895 . 30467) (EDITPROP 30469 . 
-30688) (EF 30690 . 31019) (EP 31021 . 31204) (EV 31206 . 31385) (EDITE 31387 . 32265) (EDITL 32267 . 
-32493)) (32845 48162 (NEW/EDITDATE 32855 . 33077) (FIXEDITDATE 33079 . 41686) (EDITDATE? 41688 . 44716
-) (EDITDATE 44718 . 46165) (SETINITIALS 46167 . 48160)))))
+  (FILEMAP (NIL (4073 11670 (ED 4073 . 11670)) (11672 15648 (INSTALL-PROTOTYPE-DEFN 11672 . 15648)) (
+15649 32572 (EDITDEF.FNS 15659 . 17059) (EDITF 17061 . 17941) (EDITFB 17943 . 18791) (EDITFNS 18793 . 
+20113) (EDITLOADFNS? 20115 . 23991) (EDITMODE 23993 . 26003) (EDITP 26005 . 26516) (EDITV 26518 . 
+27157) (DC 27159 . 27840) (DF 27842 . 28884) (DP 28886 . 29970) (DV 29972 . 30544) (EDITPROP 30546 . 
+30765) (EF 30767 . 31096) (EP 31098 . 31281) (EV 31283 . 31462) (EDITE 31464 . 32342) (EDITL 32344 . 
+32570)) (32922 48239 (NEW/EDITDATE 32932 . 33154) (FIXEDITDATE 33156 . 41763) (EDITDATE? 41765 . 44793
+) (EDITDATE 44795 . 46242) (SETINITIALS 46244 . 48237)))))
 STOP
diff --git a/sources/EDITINTERFACE.DFASL b/sources/EDITINTERFACE.DFASL
index 72acc7a158dc788fb6e74d4e71d75cc766e80122..7967360365595d5330b2edd6082089224bc57d43 100644
GIT binary patch
delta 260
zcmdne%DBCiaYA9dIahFgX;E^jLRw}{szP#6YGO%hih_cXu77fgu91O}se++_m5H&H
zfd!YFW3UgZvXG3@qT-aqN*x6w1)%!;q|_n>kRBblri~Z(afx9uY-*49M0GDl^UWW)
zzcMnqZGOhPl#wxSau0tV<NwLO`K1`2OcoPxU|hU8Twn?#<Il-&1fTQwdd~7>WK3e%
z@5#u-*x)(&o>0An-HfR{?5-}JAug_NO$-dIhBMPa6zk?v;b2BVO^|Frkbi(ra0p0P
SYV%Ez`NB+QMw_cNtfT<x)=^gg

delta 255
zcmdnq%DAPKaYA8&8CP(AX;E^jLRw}{szP#6YGO%hih_cnu77fgu91O}se+NQm63s!
zu{oEUW3UgZvhdWDywu{9#7Z3nLj|CQ{G`+(1&}5kxUP*C_HhYgF>UffZeK>T&F{It
zGBP@Ce#*O)kuhs>H-8@E@5#UTr5GPf78P({oWD6tU<xDS*U7I1pL2J5GBPGH?Du43
zVx0U?s9wTq#?&5mR~OF^7gx6?1_oB$ndu;kadU-mFr%O<NH!qIKfotA1SBlB`HskZ
NVJ1_H&9xd<QUC#uPU-*v


From 052419c8396b6de2dd3daaa1979dbfcb2f5ca169 Mon Sep 17 00:00:00 2001
From: rmkaplan <ron.kaplan@post.harvard.edu>
Date: Fri, 3 Oct 2025 22:17:57 -0700
Subject: [PATCH 8/8] Delete EDITINTERFACE.LCOM

Should be DFASL
---
 sources/EDITINTERFACE.LCOM | Bin 16604 -> 0 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)
 delete mode 100644 sources/EDITINTERFACE.LCOM

diff --git a/sources/EDITINTERFACE.LCOM b/sources/EDITINTERFACE.LCOM
deleted file mode 100644
index eabdfeddd9aa2a810520a9cf42347cfecaa89af6..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 16604
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
Bz_|bb