From 1a8a5ca90e4553e9e0448adf38dd061d0bfb5d9a Mon Sep 17 00:00:00 2001 From: rmkaplan <69548581+rmkaplan@users.noreply.github.com> Date: Sun, 7 Sep 2025 22:15:47 -0700 Subject: [PATCH] Fix TEDIT object insertion (#2279) --- library/tedit/TEDIT | 62 +++++++++++++++++++-------------------- library/tedit/TEDIT.LCOM | Bin 33346 -> 33226 bytes 2 files changed, 31 insertions(+), 31 deletions(-) diff --git a/library/tedit/TEDIT b/library/tedit/TEDIT index 1d19b3d6..ae2db6a1 100644 --- a/library/tedit/TEDIT +++ b/library/tedit/TEDIT @@ -1,14 +1,12 @@ (DEFINE-FILE-INFO PACKAGE "INTERLISP" READTABLE "INTERLISP" BASE 10) -(FILECREATED " 1-Aug-2025 14:50:15"  -{DSK}kaplan>Local>medley3.5>working-medley>library>tedit>TEDIT.;835 145114 +(FILECREATED " 6-Sep-2025 09:54:48" {WMEDLEY}TEDIT>TEDIT.;837 145260 :EDIT-BY rmk - :CHANGES-TO (FNS \TEDIT.PARA.FIRST \TEDIT.PARA.LAST) + :CHANGES-TO (FNS \TEDIT.REPLACE.SELPIECES TEDIT.INSERT.OBJECT) - :PREVIOUS-DATE "28-Jul-2025 23:49:50" -{DSK}kaplan>Local>medley3.5>working-medley>library>tedit>TEDIT.;834) + :PREVIOUS-DATE " 1-Aug-2025 14:50:15" {WMEDLEY}TEDIT>TEDIT.;835) (PRETTYCOMPRINT TEDITCOMS) @@ -762,7 +760,8 @@ (DEFINEQ (TEDIT.INSERT.OBJECT - [LAMBDA (OBJECT TSTREAM CH# LOOKS) (* ; "Edited 28-Jul-2025 23:48 by rmk") + [LAMBDA (OBJECT TSTREAM CH# LOOKS) (* ; "Edited 6-Sep-2025 08:54 by rmk") + (* ; "Edited 28-Jul-2025 23:48 by rmk") (* ; "Edited 7-May-2025 00:10 by rmk") (* ; "Edited 21-Apr-2025 22:17 by rmk") (* ; "Edited 6-Apr-2025 14:10 by rmk") @@ -824,7 +823,7 @@ 0 'LEFT) (\TEDIT.FIXSEL SEL TSTREAM)) - (\TEDIT.INSERT.SELPIECES OBJSELPIECES TEXTOBJ SEL) + (\TEDIT.INSERT.SELPIECES OBJSELPIECES TSTREAM SEL) (CL:WHEN LOOKS (\TEDIT.CHANGE.CHARLOOKS TSTREAM LOOKS SEL)) (\TEDIT.SCROLL.CARET TSTREAM) (\TEDIT.SEL.ON TSTREAM]) @@ -1527,7 +1526,8 @@ (\TEDIT.SCROLL.CARET TOTSTREAM)))]) (\TEDIT.REPLACE.SELPIECES - [LAMBDA (INSERTSELPIECES TSTREAM SEL) (* ; "Edited 7-May-2025 00:13 by rmk") + [LAMBDA (INSERTSELPIECES TSTREAM SEL) (* ; "Edited 6-Sep-2025 09:54 by rmk") + (* ; "Edited 7-May-2025 00:13 by rmk") (* ; "Edited 21-Apr-2025 22:29 by rmk") (* ; "Edited 19-Mar-2025 15:46 by rmk") (* ; "Edited 8-Dec-2024 13:46 by rmk") @@ -1578,7 +1578,7 @@ (CL:WHEN (AND INSERTSELPIECES (IGEQ (SETQ ILEN (GETSPC INSERTSELPIECES SPLEN)) 0) - (\TEDIT.INSERT.SELPIECES INSERTSELPIECES TEXTOBJ SEL T)) + (\TEDIT.INSERT.SELPIECES INSERTSELPIECES TSTREAM SEL T)) (* ;; "If both delete and insert happened, foush the insert event and upgrade the DELEVENT to a single :Replace. The insert has not updated the lines or the selection") @@ -2325,26 +2325,26 @@ (ADDTOVAR PRINTFILETYPES (TEDIT (TEST \TEDIT.GET.TRAILER) (EXTENSION (TEDIT)))) (DECLARE%: DONTCOPY - (FILEMAP (NIL (4922 7316 (MAKE-TEDIT-EXPORTS.ALL 4932 . 5478) (UPDATE-TEDIT 5480 . 6409) (EDIT-TEDIT -6411 . 7314)) (8746 36804 (TEDIT 8756 . 11370) (TEXTSTREAM 11372 . 13261) (TEXTSTREAMP 13263 . 13647) -(COERCETEXTSTREAM 13649 . 17860) (TEDIT.CONCAT 17862 . 21164) (TEDITSTRING 21166 . 22080) (TEDIT-SEE -22082 . 22641) (TEDIT.COPY 22643 . 24788) (TEDIT.DELETE 24790 . 26151) (TEDIT.INSERT 26153 . 29527) ( -TEDIT.TERPRI 29529 . 30643) (TEDIT.KILL 30645 . 31627) (TEDIT.QUIT 31629 . 32995) (TEDIT.MOVE 32997 . -33885) (TEDIT.STRINGWIDTH 33887 . 34558) (TEDIT.CHARWIDTH 34560 . 36802)) (36805 38746 (TEXTOBJ 36815 - . 37280) (COERCETEXTOBJ 37282 . 38744)) (40146 41796 (TDRIBBLE 40156 . 41794)) (41837 53624 ( -TEDIT.INSERT.OBJECT 41847 . 45445) (TEDIT.EDIT.OBJECT 45447 . 48387) (TEDIT.OBJECT.CHANGED 48389 . -51579) (TEDIT.MAP.OBJECTS 51581 . 53152) (\TEDIT.FIRST.OBJPIECE 53154 . 53387) (\TEDIT.NEXT.OBJPIECE -53389 . 53622)) (53647 61090 (\TEDIT.CONCAT.PAGEFRAMES 53657 . 58724) (\TEDIT.GET.PAGE.HEADINGS 58726 - . 59755) (\TEDIT.CONCAT.INSTALL.HEADINGS 59757 . 61088)) (61091 64698 (\TEDIT.MOVE.MSG 61101 . 63182) - (\TEDIT.READONLY 63184 . 64696)) (64699 70474 (TEDIT.NCHARS 64709 . 65082) (TEDIT.RPLCHARCODE 65084 - . 68074) (TEDIT.NTHCHARCODE 68076 . 70003) (TEDIT.NTHCHAR 70005 . 70472)) (70520 127440 (\TEDIT1 -70530 . 72607) (\TEDIT.INSERT 72609 . 78974) (\TEDIT.MOVE 78976 . 86882) (\TEDIT.COPY 86884 . 91415) ( -\TEDIT.REPLACE.SELPIECES 91417 . 95844) (\TEDIT.INSERT.SELPIECES 95846 . 98843) (\TEDIT.RESTARTFN -98845 . 101350) (\TEDIT.CHARDELETE 101352 . 104281) (\TEDIT.COPYPIECE 104283 . 109445) ( -\TEDIT.APPLY.OBJFN 109447 . 112533) (\TEDIT.DELETE 112535 . 116903) (\TEDIT.DIFFUSE.PARALOOKS 116905 - . 119176) (\TEDIT.WORDDELETE 119178 . 120793) (\TEDIT.WORDDELETE.FORWARD 120795 . 122584) ( -\TEDIT.FINISHEDIT? 122586 . 127438)) (127441 128100 (\TEDIT.THELP 127451 . 128098)) (128134 137265 ( -\TEDIT.PARAPIECES 128144 . 130118) (\TEDIT.PARACHNOS 130120 . 131012) (\TEDIT.PARA.FIRST 131014 . -134115) (\TEDIT.PARA.LAST 134117 . 137263)) (137266 144361 (\TEDIT.WORD.FIRST 137276 . 141280) ( -\TEDIT.WORD.LAST 141282 . 144359)) (144562 144839 (TEDITSYSTEMDATE 144572 . 144837))))) + (FILEMAP (NIL (4850 7244 (MAKE-TEDIT-EXPORTS.ALL 4860 . 5406) (UPDATE-TEDIT 5408 . 6337) (EDIT-TEDIT +6339 . 7242)) (8674 36732 (TEDIT 8684 . 11298) (TEXTSTREAM 11300 . 13189) (TEXTSTREAMP 13191 . 13575) +(COERCETEXTSTREAM 13577 . 17788) (TEDIT.CONCAT 17790 . 21092) (TEDITSTRING 21094 . 22008) (TEDIT-SEE +22010 . 22569) (TEDIT.COPY 22571 . 24716) (TEDIT.DELETE 24718 . 26079) (TEDIT.INSERT 26081 . 29455) ( +TEDIT.TERPRI 29457 . 30571) (TEDIT.KILL 30573 . 31555) (TEDIT.QUIT 31557 . 32923) (TEDIT.MOVE 32925 . +33813) (TEDIT.STRINGWIDTH 33815 . 34486) (TEDIT.CHARWIDTH 34488 . 36730)) (36733 38674 (TEXTOBJ 36743 + . 37208) (COERCETEXTOBJ 37210 . 38672)) (40074 41724 (TDRIBBLE 40084 . 41722)) (41765 53661 ( +TEDIT.INSERT.OBJECT 41775 . 45482) (TEDIT.EDIT.OBJECT 45484 . 48424) (TEDIT.OBJECT.CHANGED 48426 . +51616) (TEDIT.MAP.OBJECTS 51618 . 53189) (\TEDIT.FIRST.OBJPIECE 53191 . 53424) (\TEDIT.NEXT.OBJPIECE +53426 . 53659)) (53684 61127 (\TEDIT.CONCAT.PAGEFRAMES 53694 . 58761) (\TEDIT.GET.PAGE.HEADINGS 58763 + . 59792) (\TEDIT.CONCAT.INSTALL.HEADINGS 59794 . 61125)) (61128 64735 (\TEDIT.MOVE.MSG 61138 . 63219) + (\TEDIT.READONLY 63221 . 64733)) (64736 70511 (TEDIT.NCHARS 64746 . 65119) (TEDIT.RPLCHARCODE 65121 + . 68111) (TEDIT.NTHCHARCODE 68113 . 70040) (TEDIT.NTHCHAR 70042 . 70509)) (70557 127586 (\TEDIT1 +70567 . 72644) (\TEDIT.INSERT 72646 . 79011) (\TEDIT.MOVE 79013 . 86919) (\TEDIT.COPY 86921 . 91452) ( +\TEDIT.REPLACE.SELPIECES 91454 . 95990) (\TEDIT.INSERT.SELPIECES 95992 . 98989) (\TEDIT.RESTARTFN +98991 . 101496) (\TEDIT.CHARDELETE 101498 . 104427) (\TEDIT.COPYPIECE 104429 . 109591) ( +\TEDIT.APPLY.OBJFN 109593 . 112679) (\TEDIT.DELETE 112681 . 117049) (\TEDIT.DIFFUSE.PARALOOKS 117051 + . 119322) (\TEDIT.WORDDELETE 119324 . 120939) (\TEDIT.WORDDELETE.FORWARD 120941 . 122730) ( +\TEDIT.FINISHEDIT? 122732 . 127584)) (127587 128246 (\TEDIT.THELP 127597 . 128244)) (128280 137411 ( +\TEDIT.PARAPIECES 128290 . 130264) (\TEDIT.PARACHNOS 130266 . 131158) (\TEDIT.PARA.FIRST 131160 . +134261) (\TEDIT.PARA.LAST 134263 . 137409)) (137412 144507 (\TEDIT.WORD.FIRST 137422 . 141426) ( +\TEDIT.WORD.LAST 141428 . 144505)) (144708 144985 (TEDITSYSTEMDATE 144718 . 144983))))) STOP diff --git a/library/tedit/TEDIT.LCOM b/library/tedit/TEDIT.LCOM index 500cfb3c5bcbb99224644709f8542b5e389ecb8e..b65f4bca9a53245c31801a493d08ac0603c3c8eb 100644 GIT binary patch delta 726 zcmaiyPm9w)7{>bt1&gq!6n}p7)(+e(%G4eqH(Us`7R)*Z3$&d0CVZ zh%FPTrfP7|;P#G>(#bU0hvO%}!OI;F+b$lSZcQh<**Kfsjj`>-%U!r*D0&lW9H75m zl3^m*L<$GHS@Op$d7frZZ<+A$?79%*fV#7_`GmdE?Yl1g>mUdM2m9k^jNyN4#S~Sp zS!;A17k5HzF+Ya6a+dSi>maE})&;)prF zH@fBBzR*6f4ldKjURbv1C-0=J(39SJRcaaZ=cDy2YLQ_;0=$j=n9ZO7{YtJ@B@xj# zqw9^9R`hh8L4;i}j6&!KIjE3}8lvgw+8pUcE$We-ynqUU#cLDa9kRG(MFW?R2NB5Z zzu4Htu|s^2#TG0h$xo7j;4G$|6U8JP{>IZ+s+tC7n55QpyqAEaNvm$k1~8z&!5tid ZB&n=t5VP#TkijRRXSty3ix1?z{0p`L$Cm&A delta 790 zcmb`FPm9w)7{>bt1S2AKrBW8;B}i$J#LOhqKT!f{JF(fONlDVB3+th_VJS`9wY!V# zidN7Mpw7`xAw7BZ=qK=~XJK#Noox{n3VLvE^UgcZ^FF_sPcKs+U!`967DzHr4kWB# z0!Y(|q9Y)HM8Q8Yg?#{I*%KQ)}$pdTBPXc$MQs!WV0 zv-x;5J&@KFBOX1P_vfd^aWotq8zF7jp?t5Rk|Kz>D(#%aYtJhf>4fM?m7Bczu+6e( z+Y1Tn~glB-RS3Bo>8&WjnO)QYZmX{!*FB-Ar174 zcv5W-=94i9dcA474`?8T9uzE>T|LV$^o~z=ZLb?h4L%%aQ2E6GtGZU@=>I2Ytthn3 z7L``uCA!R{;@ipQ@_C-*uYJFiNTkin3BKOGPkdv^PL_RkGHJ6Wuye;xHksLeoJ8!) z!)&TrVy3&5Mg+63?JZtB&*#!eQCY^lbzOt~^}||rFQ5)oE}Cy7Rd%PD%MkMOlpo2S zWw96T&4mVz=d}XBScL|4XlQ#bV5JPU8&H3>LlqTPvQ0Y(J%5kxQa1!t-dHVh_s+%t267UH+Hm%bj2MA%_)C;}Z4pbCyJ-=-_P$tW}-aGsQ`8ncY