From f5e48847c948dcdd4c6bc2ad67d3e6f57dfa06ae Mon Sep 17 00:00:00 2001 From: Larry Masinter Date: Wed, 24 Aug 2022 07:24:08 -0700 Subject: [PATCH] thie problem only shows when you switch EDITMODE but have some SEDIT windows open (#912) --- sources/SEDIT-TOPLEVEL | 48 ++++++++++++++++++++--------------- sources/SEDIT-TOPLEVEL.DFASL | Bin 14351 -> 14395 bytes 2 files changed, 27 insertions(+), 21 deletions(-) diff --git a/sources/SEDIT-TOPLEVEL b/sources/SEDIT-TOPLEVEL index 914e16f7..a6299b13 100644 --- a/sources/SEDIT-TOPLEVEL +++ b/sources/SEDIT-TOPLEVEL @@ -1,12 +1,10 @@ (DEFINE-FILE-INFO PACKAGE (DEFPACKAGE "SEDIT" (USE "LISP" "XCL")) READTABLE "XCL" BASE 10) -(IL:FILECREATED " 8-Dec-2021 14:01:58"  -IL:|{DSK}kaplan>Local>medley3.5>my-medley>sources>SEDIT-TOPLEVEL.;19| 37986 +(IL:FILECREATED "23-Aug-2022 20:43:35" IL:|{DSK}larry>medley>sources>SEDIT-TOPLEVEL.;3| 38392 - :CHANGES-TO (IL:FNS GET-WINDOW-REGION) + :CHANGES-TO (IL:FNS MARKASCHANGEDFN) - :PREVIOUS-DATE " 8-Dec-2021 11:50:57" -IL:|{DSK}kaplan>Local>medley3.5>my-medley>sources>SEDIT-TOPLEVEL.;18|) + :PREVIOUS-DATE " 8-Dec-2021 14:01:58" IL:|{DSK}larry>medley>sources>SEDIT-TOPLEVEL.;1|) ; Copyright (c) 1986-1988, 1990-1991 by Venue & Xerox Corporation. @@ -240,7 +238,8 @@ IL:|{DSK}kaplan>Local>medley3.5>my-medley>sources>SEDIT-TOPLEVEL.;18|) ) (MARKASCHANGEDFN - (IL:LAMBDA (NAME TYPE REASON) (IL:* IL:\; "Edited 8-Dec-2021 11:49 by rmk") + (IL:LAMBDA (NAME TYPE REASON) (IL:* IL:\; "Edited 23-Aug-2022 20:41 by lmm") + (IL:* IL:\; "Edited 8-Dec-2021 11:49 by rmk") (IL:* IL:\; "Edited 2-Dec-2021 22:57 by larry") (IL:* IL:\; "Edited 3-Apr-91 15:42 by jds") @@ -264,8 +263,15 @@ IL:|{DSK}kaplan>Local>medley3.5>my-medley>sources>SEDIT-TOPLEVEL.;18|) (IL:* IL:|;;| "found a matching context elsewhere") - (IL:RESETFORM (IL:EDITMODE 'SEDIT) - (IL:EDITDEF NAME TYPE NIL NIL '(:DONTWAIT)))))))) + (IL:RESETLST + + (IL:* IL:|;;| " This isn't quite right because there is more context for editdef, e.g. if you're eding a definition loaded from a file") + + (IL:* IL:|;;| " Rather than calling EDITDEF again lmm 8/23/22") + + (IL:RESETSAVE (IL:TTY.PROCESS (IL:THIS.PROCESS))) + (IL:RESETSAVE (IL:EDITMODE 'SEDIT)) + (IL:EDITDEF NAME TYPE NIL NIL '(:DONTWAIT)))))))) (new-function-body (il:lambda (dummy-body) (il:* il:\; "Edited 7-Jul-87 12:59 by DCB") (if (il:neq (il:editmode) (quote sedit)) (il:copy dummy-body) (list (quote il:lambda) args-gap body-gap))) @@ -574,17 +580,17 @@ IL:|{DSK}kaplan>Local>medley3.5>my-medley>sources>SEDIT-TOPLEVEL.;18|) (IL:DEFPRINT 'GAP 'PRINT-GAP) (IL:PUTPROPS IL:SEDIT-TOPLEVEL IL:COPYRIGHT ("Venue & Xerox Corporation" 1986 1987 1988 1990 1991)) (IL:DECLARE\: IL:DONTCOPY - (IL:FILEMAP (NIL (3174 8776 (SEDIT 3187 . 5173) (RESET 5175 . 5376) (GET-WINDOW-REGION 5378 . 6676) ( -SAVE-WINDOW-REGION 6678 . 7692) (GET-WINDOW 7694 . 7998) (GET-PROP 8000 . 8304) (PUT-PROP 8306 . 8774) -) (8777 15717 (GET-CONTEXT 8790 . 10810) (DISINTEGRATE-CONTEXT 10812 . 11538) (AWAKE-COMMAND-PROCESS -11540 . 13133) (AWAKE-ME 13135 . 13518) (MARKASCHANGEDFN 13520 . 15513) (NEW-FUNCTION-BODY 15515 . -15715)) (15719 16702 (QUERY-THROW-AWAY-CHANGES 15719 . 16702)) (16704 17479 (SET-OPTIONS 16704 . 17479 -)) (17481 20829 (SET-PROPS 17481 . 20829)) (20831 21502 (START-PROCESS 20831 . 21502)) (21818 34795 ( -SEDITE 21831 . 27598) (SEDITL 27600 . 28745) (FN-CHANGED 28747 . 29042) (PROP-CHANGED 29044 . 29181) ( -PROPLST-CHANGED 29183 . 29311) (VAR-CHANGED 29313 . 29425) (ALIST-COMPLETION 29427 . 30238) ( -COMPLETION 30240 . 31620) (PROPS-COMPLETION 31622 . 32447) (TTYFN 32449 . 34287) ( -LOCATE-NODE-FROM-EDITCHAIN 34289 . 34793)) (34941 35310 (SMART-TTYFN 34941 . 35310)) (35433 37118 ( -PRETTY-PRINT 35446 . 36489) (MAP-FONT 36491 . 37116)) (37300 37403 (MAKE-BROKEN-ATOM 37300 . 37403)) ( -37405 37563 (PRINT-BROKEN-ATOM 37405 . 37563)) (37565 37649 (MAKE-GAP 37565 . 37649)) (37651 37779 ( -PRINT-GAP 37651 . 37779))))) + (IL:FILEMAP (NIL (3126 8728 (SEDIT 3139 . 5125) (RESET 5127 . 5328) (GET-WINDOW-REGION 5330 . 6628) ( +SAVE-WINDOW-REGION 6630 . 7644) (GET-WINDOW 7646 . 7950) (GET-PROP 7952 . 8256) (PUT-PROP 8258 . 8726) +) (8729 16123 (GET-CONTEXT 8742 . 10762) (DISINTEGRATE-CONTEXT 10764 . 11490) (AWAKE-COMMAND-PROCESS +11492 . 13085) (AWAKE-ME 13087 . 13470) (MARKASCHANGEDFN 13472 . 15919) (NEW-FUNCTION-BODY 15921 . +16121)) (16125 17108 (QUERY-THROW-AWAY-CHANGES 16125 . 17108)) (17110 17885 (SET-OPTIONS 17110 . 17885 +)) (17887 21235 (SET-PROPS 17887 . 21235)) (21237 21908 (START-PROCESS 21237 . 21908)) (22224 35201 ( +SEDITE 22237 . 28004) (SEDITL 28006 . 29151) (FN-CHANGED 29153 . 29448) (PROP-CHANGED 29450 . 29587) ( +PROPLST-CHANGED 29589 . 29717) (VAR-CHANGED 29719 . 29831) (ALIST-COMPLETION 29833 . 30644) ( +COMPLETION 30646 . 32026) (PROPS-COMPLETION 32028 . 32853) (TTYFN 32855 . 34693) ( +LOCATE-NODE-FROM-EDITCHAIN 34695 . 35199)) (35347 35716 (SMART-TTYFN 35347 . 35716)) (35839 37524 ( +PRETTY-PRINT 35852 . 36895) (MAP-FONT 36897 . 37522)) (37706 37809 (MAKE-BROKEN-ATOM 37706 . 37809)) ( +37811 37969 (PRINT-BROKEN-ATOM 37811 . 37969)) (37971 38055 (MAKE-GAP 37971 . 38055)) (38057 38185 ( +PRINT-GAP 38057 . 38185))))) IL:STOP diff --git a/sources/SEDIT-TOPLEVEL.DFASL b/sources/SEDIT-TOPLEVEL.DFASL index 19a34dcaceccb75cfec7cb2e8b3803cdf52cd816..44c8c4a628c2b3422fdf326eaee95df9ddeacfa5 100644 GIT binary patch delta 1571 zcmZuxZ%k8H6o0p`eU!FJoo$6upg{Svt`GZ%IzY#Klvk;=6#5HM-~na;#y$ud7LSr~IB`?5GbZA(n%?mZ7NCQF)oe&_st z_niCA?LC(#zMfd(^`qmb6RoEPCMTy_Gm(lDKAkk4oE%EnPri04VIP`I44h32+r2(s zNRIGcx7Ta;x?383Ek3_4C`jRFWpXlcW_V!AMf7%}Po6nT)Lt*~VNYZ8jUP9(_5YV_ zCGB~$UFv-6z_Z6ezPv$KrsFgh7>4-}?={6y9M74Yuax%f+*PT0gJCMh3B#C}*THu1 z#!(}q(qxy@24_r^L^&9ZMI>i7lTCBd5lI#!Ds^@xtpiSy1zA+F#4ikor0)KXkR-F* zve{u^3v#3)(&u8F3fG$(kOq&MgJivJc9&ntuA<%%T2@P!Lb{Avt)tc+>yYYOe8XhY zDCjS9wU$MYsSuY~N~aNnvP6Z}^p|E2`J1?C_HtSu7s9=w#FN9wL2{~s zW05$;0>xr`NNyK{4uZ85N22Ybo;Z40KGM(~iv~nV;-Hq9t;pG}0PRZkO0=I=+O?F{ zwnw|V66jD-b&!{Juq!l6i;R7#k2`=Yg1? zP>gcAg`+uvhrlBIbvLrBjB&ZvMS9KG*5O|r5+DygSrgtu4{AC9^_IJ6_Pekf;3o<^ zq!@g)_8)W|=jv+7daKS>T0*XN25EBSF)*qfib%P39{*jpgf8M#y#w9B*XvKCJNeS* z@1fw#F_6tV!K`z%;HRVu9P~?~?gCK1Oo2)DDMsmc%As)B{lWvZj?Jzrw3u&lHKC&Q zBrr2EFtd1?Hy5QM%HDut@HPHl+gNAL?jr3|hXqM~juOltY%2(c@iz_gWsd+CtH^@^ zM8EOLTWQ9FdvEJ&$R0-FaDzL()z~$+OY5>h*o8OTcMI3H-rpnqxu?A7CR>_2XUUyY zlCI&OJ^iRZ@AuwAT6YWGrE+6KqXXT zX6%O6L3c9KMz>%z{@Ien+4!JF4JIz?9_EY5Odv7FMSZdlKDZa>_eY5jKA7Bm=lp)> zeCM2dzVm&bEN(7tN#f|Tvb5|ynOdAp&3nTOQ>j_+oH9MDtaLg(-nkVCKGj;=+E9_}4x)S~@$8jHA zG$xP?NuvWDfNxF4x|y1XkTB12)&*?kjNC~ok4T0Y1IG)nZLH-573>=As(eg^KyPwB zTtWi9lDm}A1Op*C5)B05QPW^WDWT8jMIv6v;}sd;tjVQ*H}@)MgI`THbM9is;20fF zhK2*uNGvJ`{j!5PY7hsmN>hLz@(7mPW~MCR3y%ilQaBWsjW|*1cqBpea-x%@f#4vA zv^hYzt&AoR9hQ^6kj#PCy&%y7udObD2Mu{}k+iR*QF~SJqeDrTy%r3QW zU;-cHW=8P)Vyi65A``5T^T+c(i4q%d&EAdMdfn9my2cpQn&G)79b9M({|o7xj_f06 zT`Ng&lLnybTTC5d0={bc16_li<|e%U(rm7+#s_)^sq=UoIsO6Wgs5`iUWZF*A9*nj9gm&Rzdjr}iOtkl+ z&fQbgvKpgeO+{+HLK=)`VI z8Gfi6UOuo>)_{X@)TtVht_1B-T+?c%R4ZuRH?>ygxdV+%KT}@T?KW= z7)lhL?6{3I&VI6scY>$OjtX$RD}kEeMpxCEI&#=oLK1ylQp}DR{sFpT_Sinq6tl5? zpf6_Q`{2Q1RyNSvuO%@IoWPM=fv=ixG%OF|OC}&pX#IHZMkwSl)P-a`h<<{b1%Yhv zMAPYz974_uxl?z9Uj_IFYx~bL71i`iEWv69N-x X0B(7{z!&*K_s4h*_53DG+`s=9_eYnE