From 5366ae124cabda45b112d63409d2ebcd0b60ba0b Mon Sep 17 00:00:00 2001 From: rmkaplan Date: Mon, 17 Mar 2025 12:04:27 -0700 Subject: [PATCH 1/3] Remove dependency on internal TEXTOBJ field --- doctools/IMINDEX | 30 +++++++++++++++--------------- doctools/IMINDEX.LCOM | Bin 16903 -> 16879 bytes 2 files changed, 15 insertions(+), 15 deletions(-) diff --git a/doctools/IMINDEX b/doctools/IMINDEX index 6b1a8976..4d25ac3c 100644 --- a/doctools/IMINDEX +++ b/doctools/IMINDEX @@ -1,12 +1,12 @@ (DEFINE-FILE-INFO PACKAGE "INTERLISP" READTABLE "INTERLISP" BASE 10) -(FILECREATED " 7-Apr-2024 09:25:49" {WMEDLEY}IMINDEX.;6 37064 +(FILECREATED "29-Jun-2024 00:14:46" {WMEDLEY}IMINDEX.;8 37147 :EDIT-BY rmk - :CHANGES-TO (FNS IM.INDEX.PUTFN IM.INDEX.GETFN) + :CHANGES-TO (FNS IM.INDEX.EDIT) - :PREVIOUS-DATE " 4-Apr-2024 23:17:47" {WMEDLEY}IMINDEX.;5) + :PREVIOUS-DATE " 7-Apr-2024 09:25:49" {WMEDLEY}IMINDEX.;6) (PRETTYCOMPRINT IMINDEXCOMS) @@ -163,11 +163,11 @@ (TERPRI PTRFILE]) (IM.INDEX.EDIT - [LAMBDA (OBJ TEXTSTREAM) (* ; "Edited 18-Jul-88 14:10 by burns") - + [LAMBDA (OBJ TEXTSTREAM) (* ; "Edited 29-Jun-2024 00:14 by rmk") + (* ; "Edited 18-Jul-88 14:10 by burns") (PROG* ((W (FREEMENU IM.INDEX.OBJ.FREEMENU.SPECS)) (REGION (WINDOWREGION W)) - [TEDIT.WINDOW (CAR (fetch \WINDOW of (TEXTOBJ TEXTSTREAM] + (TEDIT.WINDOW (\TEDIT.PRIMARYPANE (TEXTOBJ TEXTSTREAM))) (TEDIT.REGION (AND TEDIT.WINDOW (WINDOWREGION TEDIT.WINDOW))) OBJ.DATA OBJ.DATA.PROPLIST) (WINDOWPROP W 'IM.INDEX.OBJ OBJ) @@ -640,13 +640,13 @@ (IM.INDEX.INIT) (DECLARE%: DONTCOPY - (FILEMAP (NIL (1692 15373 (IM.INDEX.CLOSEF 1702 . 2393) (IM.INDEX.COPYFN 2395 . 2580) ( -IM.INDEX.CREATEOBJ 2582 . 3928) (IM.INDEX.DISPLAY.STRING 3930 . 4351) (IM.INDEX.DISPLAYFN 4353 . 8450) - (IM.INDEX.EDIT 8452 . 11920) (IM.INDEX.LIST.FROM.STRING 11922 . 12956) (IM.INDEX.SIZEFN 12958 . 13718 -) (IM.INDEX.STRING.FROM.LIST 13720 . 13965) (IM.INDEX.PUTFN 13967 . 14313) (IM.INDEX.GETFN 14315 . -14612) (IM.INDEX.BUTTONEVENTFN 14614 . 15371)) (15374 17444 (IM.INDEX.INIT 15384 . 17442)) (17445 -29361 (IM.INDEX.MENU 17455 . 19143) (IM.INDEX.MENU.WHENSELECTEDFN 19145 . 25900) ( -IM.INDEX.OBJ.FREEMENU.SELECTEDFN 25902 . 29359)) (31877 37020 (IM.CHAP.COPYFN 31887 . 32067) ( -IM.CHAP.CREATEOBJ 32069 . 33495) (IM.CHAP.DISPLAYFN 33497 . 35457) (IM.CHAP.SIZEFN 35459 . 36461) ( -IM.CHAP.PUTFN 36463 . 36647) (IM.CHAP.GETFN 36649 . 36810) (IM.CHAP.BUTTONEVENTFN 36812 . 37018))))) + (FILEMAP (NIL (1676 15456 (IM.INDEX.CLOSEF 1686 . 2377) (IM.INDEX.COPYFN 2379 . 2564) ( +IM.INDEX.CREATEOBJ 2566 . 3912) (IM.INDEX.DISPLAY.STRING 3914 . 4335) (IM.INDEX.DISPLAYFN 4337 . 8434) + (IM.INDEX.EDIT 8436 . 12003) (IM.INDEX.LIST.FROM.STRING 12005 . 13039) (IM.INDEX.SIZEFN 13041 . 13801 +) (IM.INDEX.STRING.FROM.LIST 13803 . 14048) (IM.INDEX.PUTFN 14050 . 14396) (IM.INDEX.GETFN 14398 . +14695) (IM.INDEX.BUTTONEVENTFN 14697 . 15454)) (15457 17527 (IM.INDEX.INIT 15467 . 17525)) (17528 +29444 (IM.INDEX.MENU 17538 . 19226) (IM.INDEX.MENU.WHENSELECTEDFN 19228 . 25983) ( +IM.INDEX.OBJ.FREEMENU.SELECTEDFN 25985 . 29442)) (31960 37103 (IM.CHAP.COPYFN 31970 . 32150) ( +IM.CHAP.CREATEOBJ 32152 . 33578) (IM.CHAP.DISPLAYFN 33580 . 35540) (IM.CHAP.SIZEFN 35542 . 36544) ( +IM.CHAP.PUTFN 36546 . 36730) (IM.CHAP.GETFN 36732 . 36893) (IM.CHAP.BUTTONEVENTFN 36895 . 37101))))) STOP diff --git a/doctools/IMINDEX.LCOM b/doctools/IMINDEX.LCOM index 576ff64268788cb8a87e12107b711dfdb32cab16..ef70438910fe560266c3500206a15dd5ccc4438c 100644 GIT binary patch delta 886 zcmZuv+iDY06m_a14H{yS3YsdLK(V3CaBg$Ui%gS~I3;s&E=>y})HXt~)>0LG%Y%Zi zmh%DPH{>UL^fP=A`~}aMq)Z4M4(vVa?6uFntZ!ene_yokqdIZgyPwY51Q7-ZbujBN z^YX1ev0G4T61%u0w1ed_n(+E!eDwa^`N`?{7{;H^FFtH^!1Hx4=<$7>_q-HN&Y;=P zhC^6PpzC@Qjt@Ud)^(W)YPL$7eQ(ISF?S!Pya&zeiW9E(9*lt582oULOOIjb`+E1e z8w_}oNp?Md=R-S0T)O2pVmv8 zj50{F9eGl|p8_L>c(J`!Wtd*U2a#+FF>&awRjFgn;lTAdP}>qewjY!&N1=HFY9Udn z*6-zUsp3*OZCtHQXdX1DgXcg delta 936 zcmZuv&2G~`5XMESP(-SPlp;~38X_TLL5z33_SzN_N|SXkihtzTN#FnhnnU@G0taq6 zfW(z*Uj!*H0XN=&N9ZfCw$nNdSl0f0GxN>2GjsYy`u0`&KH3G^YR~2^tYQMHWng_D6Do?*fYQ;6PlD#3Of_U{s3Dh{j@xIQh_z$ZngJjU^iXg#E*507mh}wj5Bppcl@~8Cds&vZl?9{JpUlQN1Ytqu)`7Jdq1VPCB z5fGDr7Yvy=5dw~AHUzn<(E&wlA=XfJIRd0W#FH zld6HJ%SaR~7$pN1g;5ZKsfnt!dn`D7oZTq`@xa_E19Wo(AR6T6i1pmS2hqWpjblLo zNY73Db+xuzZW4{cAUPC&>L7%h{G@uLVw{0bLh%}v^2xous%5QEzwI&5ES3MM?k!B5 zqFJ;?Q>CkRpM!c97N<;_u3mJ=K$0=!q}oM>97Lpu3Pm9RTjxBBv6AX%9l!=H++5!Y z0I#RZ6k==@KA9xEPM)R1ssT>Kn8*CYjhP3?)HeW%fpy(jbWVS;VM>Q#J=ikS;YfJ~ zKur)WV4YaZU*drnkNdUjw{%=cN;@PZu9_v6n}96BpVkf}O|1J{a+y!=-dz5uJyiYz DiPP;q From ec03478fcfe642033163f8adac4ad913e887a3ce Mon Sep 17 00:00:00 2001 From: rmkaplan Date: Mon, 17 Mar 2025 12:08:35 -0700 Subject: [PATCH 2/3] TEXTSTREAM instead of TEXTOBJ --- doctools/IMINDEX | 25 +++++++++++++------------ doctools/IMINDEX.LCOM | Bin 16879 -> 16862 bytes 2 files changed, 13 insertions(+), 12 deletions(-) diff --git a/doctools/IMINDEX b/doctools/IMINDEX index 4d25ac3c..63017ed8 100644 --- a/doctools/IMINDEX +++ b/doctools/IMINDEX @@ -1,12 +1,12 @@ (DEFINE-FILE-INFO PACKAGE "INTERLISP" READTABLE "INTERLISP" BASE 10) -(FILECREATED "29-Jun-2024 00:14:46" {WMEDLEY}IMINDEX.;8 37147 +(FILECREATED "17-Mar-2025 12:07:55" {WMEDLEY}IMINDEX.;9 37246 :EDIT-BY rmk :CHANGES-TO (FNS IM.INDEX.EDIT) - :PREVIOUS-DATE " 7-Apr-2024 09:25:49" {WMEDLEY}IMINDEX.;6) + :PREVIOUS-DATE "29-Jun-2024 00:14:46" {WMEDLEY}IMINDEX.;8) (PRETTYCOMPRINT IMINDEXCOMS) @@ -163,11 +163,12 @@ (TERPRI PTRFILE]) (IM.INDEX.EDIT - [LAMBDA (OBJ TEXTSTREAM) (* ; "Edited 29-Jun-2024 00:14 by rmk") + [LAMBDA (OBJ TEXTSTREAM) (* ; "Edited 17-Mar-2025 12:06 by rmk") + (* ; "Edited 29-Jun-2024 00:14 by rmk") (* ; "Edited 18-Jul-88 14:10 by burns") (PROG* ((W (FREEMENU IM.INDEX.OBJ.FREEMENU.SPECS)) (REGION (WINDOWREGION W)) - (TEDIT.WINDOW (\TEDIT.PRIMARYPANE (TEXTOBJ TEXTSTREAM))) + (TEDIT.WINDOW (\TEDIT.PRIMARYPANE TEXTSTREAM)) (TEDIT.REGION (AND TEDIT.WINDOW (WINDOWREGION TEDIT.WINDOW))) OBJ.DATA OBJ.DATA.PROPLIST) (WINDOWPROP W 'IM.INDEX.OBJ OBJ) @@ -640,13 +641,13 @@ (IM.INDEX.INIT) (DECLARE%: DONTCOPY - (FILEMAP (NIL (1676 15456 (IM.INDEX.CLOSEF 1686 . 2377) (IM.INDEX.COPYFN 2379 . 2564) ( + (FILEMAP (NIL (1676 15555 (IM.INDEX.CLOSEF 1686 . 2377) (IM.INDEX.COPYFN 2379 . 2564) ( IM.INDEX.CREATEOBJ 2566 . 3912) (IM.INDEX.DISPLAY.STRING 3914 . 4335) (IM.INDEX.DISPLAYFN 4337 . 8434) - (IM.INDEX.EDIT 8436 . 12003) (IM.INDEX.LIST.FROM.STRING 12005 . 13039) (IM.INDEX.SIZEFN 13041 . 13801 -) (IM.INDEX.STRING.FROM.LIST 13803 . 14048) (IM.INDEX.PUTFN 14050 . 14396) (IM.INDEX.GETFN 14398 . -14695) (IM.INDEX.BUTTONEVENTFN 14697 . 15454)) (15457 17527 (IM.INDEX.INIT 15467 . 17525)) (17528 -29444 (IM.INDEX.MENU 17538 . 19226) (IM.INDEX.MENU.WHENSELECTEDFN 19228 . 25983) ( -IM.INDEX.OBJ.FREEMENU.SELECTEDFN 25985 . 29442)) (31960 37103 (IM.CHAP.COPYFN 31970 . 32150) ( -IM.CHAP.CREATEOBJ 32152 . 33578) (IM.CHAP.DISPLAYFN 33580 . 35540) (IM.CHAP.SIZEFN 35542 . 36544) ( -IM.CHAP.PUTFN 36546 . 36730) (IM.CHAP.GETFN 36732 . 36893) (IM.CHAP.BUTTONEVENTFN 36895 . 37101))))) + (IM.INDEX.EDIT 8436 . 12102) (IM.INDEX.LIST.FROM.STRING 12104 . 13138) (IM.INDEX.SIZEFN 13140 . 13900 +) (IM.INDEX.STRING.FROM.LIST 13902 . 14147) (IM.INDEX.PUTFN 14149 . 14495) (IM.INDEX.GETFN 14497 . +14794) (IM.INDEX.BUTTONEVENTFN 14796 . 15553)) (15556 17626 (IM.INDEX.INIT 15566 . 17624)) (17627 +29543 (IM.INDEX.MENU 17637 . 19325) (IM.INDEX.MENU.WHENSELECTEDFN 19327 . 26082) ( +IM.INDEX.OBJ.FREEMENU.SELECTEDFN 26084 . 29541)) (32059 37202 (IM.CHAP.COPYFN 32069 . 32249) ( +IM.CHAP.CREATEOBJ 32251 . 33677) (IM.CHAP.DISPLAYFN 33679 . 35639) (IM.CHAP.SIZEFN 35641 . 36643) ( +IM.CHAP.PUTFN 36645 . 36829) (IM.CHAP.GETFN 36831 . 36992) (IM.CHAP.BUTTONEVENTFN 36994 . 37200))))) STOP diff --git a/doctools/IMINDEX.LCOM b/doctools/IMINDEX.LCOM index ef70438910fe560266c3500206a15dd5ccc4438c..c84836b84b3aec9d5c49ccc5560c57ad6343f9d4 100644 GIT binary patch delta 814 zcmZva&2G~`5Xa?mK&nuM6$nBlFv^8iBF6jW^@am-lSwebA6nZ@TM%lba^i-#=g=1* zGEYKYf-5foM~=J#>rKFERcWQ!{q2ALJG(o7E}fs3&X?IeA_vL*(}4O^0HH%)4ux2L z^d721*zJ>`-K1p5)sXV#w}IZ~p6B)9V*dHV#f=Hf?;q|SOyV~<(ioLEhW<@Q*2H;y zTLF`l2lcV@vhF!-_1$@Y$N619-RrI5y&uj2gDl5%23!V^WXEV`EPzSkjb26R6pPaM z11G#bzx!xMNE7yNQMHMZt=G)P1yKx8>r4X?bTd-|rdZD6bezqq0(Gvl9Hf9aiKdtx zy|(LsL0)Y{76|_uU;@@28mDoV0_E_|Ts$tlTpKHWnn$UF_1t~pQUyhIWJZZ6C2;E3 zOSkL#;XitsBQT}v^JiUGkqu3w#L$q|zuX54-awnpf~Hc>RF5a#e<*BLX^l9&DzK1Q zhqb5afo+F1^n(`W<{^NFtG0z}GdAmGrvrujGtFRp5vcGylg^M^Pp$5B}&VEW^Er+c5b6`5Vr VszAb^KI`;$xG-UV^|kZX`wKOa&QbsX delta 832 zcmZva-D(p-6vtT+FNzkHv=J?>humnuEc3ZLvkGOKoWw2e2b)dPQW1pqN)Qpfj*u6y z%nSGo<|VxH(o3H}@D-fhq;67#fj#q^|M|~3XXn@4`7?LEOm~>>9e;Y)V}uDHB%~q~ z{?%LWf$G9mhpFa}@sQdjufFx3uXE4yI&ksk=^&d< z##rPHF(YjXFI%LR-lM|M>Z1e4~o+jc3xrf0crkqDDLZM)iE(KJdBxC+b<_x?;*u+HW| zRkUXt!Bg)alyz2F8F3M83Tnt}hovXqbXY=4o2=Z<1ej`kX4Oq&>;v;fBa72vW?OA! zUR@z$exs>NV(aGhb&PNr7KjO^leokLsA4yOub~<&Q2WcDZEC9rvYxDE^ae&&)xqy{nsw?5TacKs7aSYyXxc_OrK`x6Zx4ybaSq From 140415f99c7590ad43058f4f302bbe40d9ffe586 Mon Sep 17 00:00:00 2001 From: rmkaplan Date: Mon, 24 Mar 2025 10:33:25 -0700 Subject: [PATCH 3/3] Use TEDITWINDOWP instead of \TEDIT.PRIMARYPANE --- doctools/IMINDEX | 27 ++++++++++++++------------- doctools/IMINDEX.LCOM | Bin 16862 -> 16858 bytes 2 files changed, 14 insertions(+), 13 deletions(-) diff --git a/doctools/IMINDEX b/doctools/IMINDEX index 63017ed8..3f6f1512 100644 --- a/doctools/IMINDEX +++ b/doctools/IMINDEX @@ -1,12 +1,12 @@ (DEFINE-FILE-INFO PACKAGE "INTERLISP" READTABLE "INTERLISP" BASE 10) -(FILECREATED "17-Mar-2025 12:07:55" {WMEDLEY}IMINDEX.;9 37246 +(FILECREATED "24-Mar-2025 10:31:37" {WMEDLEY}IMINDEX.;10 37350 :EDIT-BY rmk :CHANGES-TO (FNS IM.INDEX.EDIT) - :PREVIOUS-DATE "29-Jun-2024 00:14:46" {WMEDLEY}IMINDEX.;8) + :PREVIOUS-DATE "17-Mar-2025 12:07:55" {WMEDLEY}IMINDEX.;9) (PRETTYCOMPRINT IMINDEXCOMS) @@ -163,12 +163,13 @@ (TERPRI PTRFILE]) (IM.INDEX.EDIT - [LAMBDA (OBJ TEXTSTREAM) (* ; "Edited 17-Mar-2025 12:06 by rmk") + [LAMBDA (OBJ TEXTSTREAM) (* ; "Edited 24-Mar-2025 10:30 by rmk") + (* ; "Edited 17-Mar-2025 12:06 by rmk") (* ; "Edited 29-Jun-2024 00:14 by rmk") (* ; "Edited 18-Jul-88 14:10 by burns") (PROG* ((W (FREEMENU IM.INDEX.OBJ.FREEMENU.SPECS)) (REGION (WINDOWREGION W)) - (TEDIT.WINDOW (\TEDIT.PRIMARYPANE TEXTSTREAM)) + (TEDIT.WINDOW (TEDITWINDOWP TEXTSTREAM)) (TEDIT.REGION (AND TEDIT.WINDOW (WINDOWREGION TEDIT.WINDOW))) OBJ.DATA OBJ.DATA.PROPLIST) (WINDOWPROP W 'IM.INDEX.OBJ OBJ) @@ -641,13 +642,13 @@ (IM.INDEX.INIT) (DECLARE%: DONTCOPY - (FILEMAP (NIL (1676 15555 (IM.INDEX.CLOSEF 1686 . 2377) (IM.INDEX.COPYFN 2379 . 2564) ( -IM.INDEX.CREATEOBJ 2566 . 3912) (IM.INDEX.DISPLAY.STRING 3914 . 4335) (IM.INDEX.DISPLAYFN 4337 . 8434) - (IM.INDEX.EDIT 8436 . 12102) (IM.INDEX.LIST.FROM.STRING 12104 . 13138) (IM.INDEX.SIZEFN 13140 . 13900 -) (IM.INDEX.STRING.FROM.LIST 13902 . 14147) (IM.INDEX.PUTFN 14149 . 14495) (IM.INDEX.GETFN 14497 . -14794) (IM.INDEX.BUTTONEVENTFN 14796 . 15553)) (15556 17626 (IM.INDEX.INIT 15566 . 17624)) (17627 -29543 (IM.INDEX.MENU 17637 . 19325) (IM.INDEX.MENU.WHENSELECTEDFN 19327 . 26082) ( -IM.INDEX.OBJ.FREEMENU.SELECTEDFN 26084 . 29541)) (32059 37202 (IM.CHAP.COPYFN 32069 . 32249) ( -IM.CHAP.CREATEOBJ 32251 . 33677) (IM.CHAP.DISPLAYFN 33679 . 35639) (IM.CHAP.SIZEFN 35641 . 36643) ( -IM.CHAP.PUTFN 36645 . 36829) (IM.CHAP.GETFN 36831 . 36992) (IM.CHAP.BUTTONEVENTFN 36994 . 37200))))) + (FILEMAP (NIL (1677 15659 (IM.INDEX.CLOSEF 1687 . 2378) (IM.INDEX.COPYFN 2380 . 2565) ( +IM.INDEX.CREATEOBJ 2567 . 3913) (IM.INDEX.DISPLAY.STRING 3915 . 4336) (IM.INDEX.DISPLAYFN 4338 . 8435) + (IM.INDEX.EDIT 8437 . 12206) (IM.INDEX.LIST.FROM.STRING 12208 . 13242) (IM.INDEX.SIZEFN 13244 . 14004 +) (IM.INDEX.STRING.FROM.LIST 14006 . 14251) (IM.INDEX.PUTFN 14253 . 14599) (IM.INDEX.GETFN 14601 . +14898) (IM.INDEX.BUTTONEVENTFN 14900 . 15657)) (15660 17730 (IM.INDEX.INIT 15670 . 17728)) (17731 +29647 (IM.INDEX.MENU 17741 . 19429) (IM.INDEX.MENU.WHENSELECTEDFN 19431 . 26186) ( +IM.INDEX.OBJ.FREEMENU.SELECTEDFN 26188 . 29645)) (32163 37306 (IM.CHAP.COPYFN 32173 . 32353) ( +IM.CHAP.CREATEOBJ 32355 . 33781) (IM.CHAP.DISPLAYFN 33783 . 35743) (IM.CHAP.SIZEFN 35745 . 36747) ( +IM.CHAP.PUTFN 36749 . 36933) (IM.CHAP.GETFN 36935 . 37096) (IM.CHAP.BUTTONEVENTFN 37098 . 37304))))) STOP diff --git a/doctools/IMINDEX.LCOM b/doctools/IMINDEX.LCOM index c84836b84b3aec9d5c49ccc5560c57ad6343f9d4..0add273d6e17eddcb776cd03852f6f6939663aa2 100644 GIT binary patch delta 177 zcmccD%y_GraYDF=k%_KvVv(+qfsv_#p@EgLp_Q@u#B4n&Ljz3(E+r!agshQ~m63^+ zsrkfBx=cm}6Ca9OqRX0E85k*Pa%s4E`nWm=xjKfpx+o}NvtY6zqa25!fr7EQv8lo2 pFh)5hE``ZujPjFZ8I3oeU@YV30c!OO3HS7K@edE!93a?d004FrEFb^? delta 199 zcmccB%y_SvaYDF=p}DSaVv(+qfsv_#p^=q=xs|Eu#B4oDOHBnXB||fWq>-VOiKUg1 z$;8dNHpt?7dU{F9I)=EqOrFYU%BEm!Ze(IMIf7A+ zNr7u}1*5!(k)^IzX&%TOCJF`yR)!{4CT0_>