From 096d860ac8994662d408684d10057dbc3c7df7fd Mon Sep 17 00:00:00 2001 From: Nick Briggs Date: Sun, 16 Oct 2022 17:31:14 -0700 Subject: [PATCH] Update \SENDMESSAGE.RESTARTABLE usage of OPENSTRINGSTREAM (#997) \SENDMESSAGE.RESTARTABLE unconditionally used OPENSTRINGSTREAM on its argument, which is not usually a string. Now, only use OPENSTRINGSTREAM if the argument is a string, otherwise pass it unchanged to TEDIT. --- library/lafite/LAFITESEND | 72 ++++++++++++++++----------------- library/lafite/LAFITESEND.LCOM | Bin 45513 -> 45274 bytes 2 files changed, 36 insertions(+), 36 deletions(-) diff --git a/library/lafite/LAFITESEND b/library/lafite/LAFITESEND index ef7c6b00..b2fcb0ec 100644 --- a/library/lafite/LAFITESEND +++ b/library/lafite/LAFITESEND @@ -1,18 +1,15 @@ (DEFINE-FILE-INFO PACKAGE "INTERLISP" READTABLE "INTERLISP" BASE 10) -(FILECREATED " 7-Feb-2022 12:04:09"  -{DSK}kaplan>Local>medley3.5>my-medley>library>lafite>LAFITESEND.;2 100778 +(FILECREATED "16-Oct-2022 10:02:19" {DSK}briggs>projects>medley>library>lafite>LAFITESEND.;2 100794 - :CHANGES-TO (FILES LAFITEDECLS) - (FNS \SENDMESSAGE.RESTARTABLE \SENDMESSAGE LAFITE.SENDMESSAGE MAKEXXXSUPPORTFORM - MAKENEWMESSAGEFORM MAKEANSWERFORM LAFITE.FILL.IN.ANSWER.FORM MAKEFORWARDFORM) + :CHANGES-TO (FNS \SENDMESSAGE.RESTARTABLE) - :PREVIOUS-DATE "30-Sep-2021 22:58:58" -{DSK}kaplan>Local>medley3.5>my-medley>library>lafite>LAFITESEND.;1) + :PREVIOUS-DATE " 7-Feb-2022 12:04:09" +{DSK}briggs>projects>medley>library>lafite>LAFITESEND.;1) (* ; " -Copyright (c) 1984-1990, 1993, 1999-2000, 2021 by Xerox Corporation. +Copyright (c) 1984-1990, 1993, 1999-2000, 2021-2022 by Xerox Corporation. ") (PRETTYCOMPRINT LAFITESENDCOMS) @@ -529,7 +526,8 @@ Copyright (c) 1984-1990, 1993, 1999-2000, 2021 by Xerox Corporation. (RETURN (\SENDMESSAGE.RESTARTABLE FORM TEDITPROPS NIL FORMNAME]) (\SENDMESSAGE.RESTARTABLE - [LAMBDA (FORM TEDITPROPS EDITORWINDOW FORMNAME) (* ; "Edited 7-Feb-2022 11:50 by rmk") + [LAMBDA (FORM TEDITPROPS EDITORWINDOW FORMNAME) (* ; "Edited 16-Oct-2022 09:59 by briggs") + (* ; "Edited 7-Feb-2022 11:50 by rmk") (* ; "Edited 3-Nov-89 15:06 by bvm") (bind (CURRENTMESSAGE _ FORM) (FIRSTTIME _ T) @@ -558,7 +556,9 @@ Copyright (c) 1984-1990, 1993, 1999-2000, 2021 by Xerox Corporation. EDITORWINDOW)) (push LAFITECURRENTEDITORWINDOWS EDITORWINDOW) (SETQ FIRSTTIME))) - [SETQ EDITORRESULT (TEDIT (OPENSTRINGSTREAM FORM) + [SETQ EDITORRESULT (TEDIT (CL:IF (STRINGP FORM) + (OPENSTRINGSTREAM FORM) + FORM) EDITORWINDOW T (APPEND TEDITPROPS (LIST 'FONT LAFITEEDITORFONT] (COND ((TTY.PROCESSP) (* ; "give back the keyboard") @@ -1764,31 +1764,31 @@ cc: ~A ) ) (PUTPROPS LAFITESEND COPYRIGHT ("Xerox Corporation" 1984 1985 1986 1987 1988 1989 1990 1993 1999 2000 -2021)) +2021 2022)) (DECLARE%: DONTCOPY - (FILEMAP (NIL (5539 28516 (DOLAFITESENDINGCOMMAND 5549 . 6039) (\SENDMESSAGE.INITIATE 6041 . 7980) ( -\SENDMSG.DELIVER 7982 . 8590) (\SENDMSG.EXIT.TEDIT 8592 . 8963) (\SENDMSG.SAVE.FORM 8965 . 10952) ( -\LAFITE.HEADER.EOF 10954 . 11247) (\LAFITE.INSERT.REPLYTO 11249 . 11857) (\SENDMSG.REPLYTO 11859 . -12418) (\SENDMSG.CHANGE.MODE 12420 . 17996) (\SENDMSG.FIND.FIELD 17998 . 18508) (\SENDMESSAGE.PARSE -18510 . 19306) (\LAFITE.PREPARE.SEND 19308 . 22141) (\LAFITE.PREPARE.ERROR 22143 . 23325) ( -\LAFITE.CHOOSE.MSG.FORMAT 23327 . 25968) (LAFITE.MAKE.PLAIN.TEXTSTREAM 25970 . 26895) ( -\SENDMESSAGE.MENUPROMPT 26897 . 27760) (\SENDMESSAGE.PROMPT 27762 . 28298) (\SENDMESSAGEFAIL 28300 . -28514)) (28517 52962 (\SENDMESSAGE 28527 . 29879) (\SENDMESSAGE.RESTARTABLE 29881 . 34865) ( -\SENDMESSAGE.CLEANUP 34867 . 35083) (\SENDMESSAGE.MAKEWINDOW 35085 . 41258) (MAKELAFITEDELIVERMENU -41260 . 41567) (\LAFITE.CLOSEMSG? 41569 . 42519) (\LAFITE.AFTER.DELIVER 42521 . 45840) ( -\LAFITE.UNSENT.ICON 45842 . 46152) (\LAFITE.FETCH.SUBJECT 46154 . 46954) (LAFITE.SENDMESSAGE 46956 . -47849) (\SENDMESSAGE0 47851 . 50715) (LA.ASSURE.PROMPT.WINDOW 50717 . 51614) (\LAFITE.SEND.FAIL 51616 - . 52087) (\LAFITE.INVALID.RECIPIENTS 52089 . 52547) (\SENDMESSAGE.ABORT 52549 . 52960)) (52994 62907 -(\OUTBOX.CREATE 53004 . 54467) (\OUTBOX.RESET 54469 . 54962) (\OUTBOX.CLOSEFN 54964 . 55104) ( -\OUTBOX.REPAINTFN 55106 . 55769) (\OUTBOX.RESHAPEFN 55771 . 57054) (\OUTBOX.SHADEITEM 57056 . 57729) ( -\OUTBOX.BUTTONFN 57731 . 60579) (\OUTBOX.DISPLAYLINE 60581 . 61075) (\OUTBOX.ADD.ITEM 61077 . 62905)) -(63203 79611 (\LAFITE.MESSAGEFORM 63213 . 67556) (MAKELAFITESUPPORTFORM 67558 . 67747) ( -MAKELISPSUPPORTFORM 67749 . 67915) (MAKEXXXSUPPORTFORM 67917 . 71966) (MAKENEWMESSAGEFORM 71968 . -72924) (MAKELAFITEPRIVATEFORMSITEMS 72926 . 73354) (\LAFITE.UNCACHE.MESSAGEFORM 73356 . 73809) ( -\LAFITE.DELETE.MESSAGEFORM 73811 . 74412) (\LAFITE.SELECT.FORM 74414 . 74769) ( -\LAFITE.DELETE.FORM.INTERNAL 74771 . 75915) (\LAFITE.READ.FORM 75917 . 78654) (\LAFITE.FIND.TEMPLATE -78656 . 79609)) (79635 87366 (\LAFITE.ANSWER 79645 . 80050) (\LAFITE.ANSWER.PROC 80052 . 81946) ( -MAKEANSWERFORM 81948 . 84478) (LA.PRINT.COMMA.LIST 84480 . 84966) (LAFITE.FILL.IN.ANSWER.FORM 84968 . -87364)) (87391 93587 (\LAFITE.FORWARD 87401 . 87809) (\LAFITE.FORWARD.PROC 87811 . 89800) ( -MAKEFORWARDFORM 89802 . 93585))))) + (FILEMAP (NIL (5333 28310 (DOLAFITESENDINGCOMMAND 5343 . 5833) (\SENDMESSAGE.INITIATE 5835 . 7774) ( +\SENDMSG.DELIVER 7776 . 8384) (\SENDMSG.EXIT.TEDIT 8386 . 8757) (\SENDMSG.SAVE.FORM 8759 . 10746) ( +\LAFITE.HEADER.EOF 10748 . 11041) (\LAFITE.INSERT.REPLYTO 11043 . 11651) (\SENDMSG.REPLYTO 11653 . +12212) (\SENDMSG.CHANGE.MODE 12214 . 17790) (\SENDMSG.FIND.FIELD 17792 . 18302) (\SENDMESSAGE.PARSE +18304 . 19100) (\LAFITE.PREPARE.SEND 19102 . 21935) (\LAFITE.PREPARE.ERROR 21937 . 23119) ( +\LAFITE.CHOOSE.MSG.FORMAT 23121 . 25762) (LAFITE.MAKE.PLAIN.TEXTSTREAM 25764 . 26689) ( +\SENDMESSAGE.MENUPROMPT 26691 . 27554) (\SENDMESSAGE.PROMPT 27556 . 28092) (\SENDMESSAGEFAIL 28094 . +28308)) (28311 52973 (\SENDMESSAGE 28321 . 29673) (\SENDMESSAGE.RESTARTABLE 29675 . 34876) ( +\SENDMESSAGE.CLEANUP 34878 . 35094) (\SENDMESSAGE.MAKEWINDOW 35096 . 41269) (MAKELAFITEDELIVERMENU +41271 . 41578) (\LAFITE.CLOSEMSG? 41580 . 42530) (\LAFITE.AFTER.DELIVER 42532 . 45851) ( +\LAFITE.UNSENT.ICON 45853 . 46163) (\LAFITE.FETCH.SUBJECT 46165 . 46965) (LAFITE.SENDMESSAGE 46967 . +47860) (\SENDMESSAGE0 47862 . 50726) (LA.ASSURE.PROMPT.WINDOW 50728 . 51625) (\LAFITE.SEND.FAIL 51627 + . 52098) (\LAFITE.INVALID.RECIPIENTS 52100 . 52558) (\SENDMESSAGE.ABORT 52560 . 52971)) (53005 62918 +(\OUTBOX.CREATE 53015 . 54478) (\OUTBOX.RESET 54480 . 54973) (\OUTBOX.CLOSEFN 54975 . 55115) ( +\OUTBOX.REPAINTFN 55117 . 55780) (\OUTBOX.RESHAPEFN 55782 . 57065) (\OUTBOX.SHADEITEM 57067 . 57740) ( +\OUTBOX.BUTTONFN 57742 . 60590) (\OUTBOX.DISPLAYLINE 60592 . 61086) (\OUTBOX.ADD.ITEM 61088 . 62916)) +(63214 79622 (\LAFITE.MESSAGEFORM 63224 . 67567) (MAKELAFITESUPPORTFORM 67569 . 67758) ( +MAKELISPSUPPORTFORM 67760 . 67926) (MAKEXXXSUPPORTFORM 67928 . 71977) (MAKENEWMESSAGEFORM 71979 . +72935) (MAKELAFITEPRIVATEFORMSITEMS 72937 . 73365) (\LAFITE.UNCACHE.MESSAGEFORM 73367 . 73820) ( +\LAFITE.DELETE.MESSAGEFORM 73822 . 74423) (\LAFITE.SELECT.FORM 74425 . 74780) ( +\LAFITE.DELETE.FORM.INTERNAL 74782 . 75926) (\LAFITE.READ.FORM 75928 . 78665) (\LAFITE.FIND.TEMPLATE +78667 . 79620)) (79646 87377 (\LAFITE.ANSWER 79656 . 80061) (\LAFITE.ANSWER.PROC 80063 . 81957) ( +MAKEANSWERFORM 81959 . 84489) (LA.PRINT.COMMA.LIST 84491 . 84977) (LAFITE.FILL.IN.ANSWER.FORM 84979 . +87375)) (87402 93598 (\LAFITE.FORWARD 87412 . 87820) (\LAFITE.FORWARD.PROC 87822 . 89811) ( +MAKEFORWARDFORM 89813 . 93596))))) STOP diff --git a/library/lafite/LAFITESEND.LCOM b/library/lafite/LAFITESEND.LCOM index 0d99d7dbeba94f685893121b6a6cb6bbe600909b..0f96e60420832391833a171a5665cb46194ecd8c 100644 GIT binary patch delta 4517 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 D6@;cI delta 4665 zcma)9Yiu0V751zjAr2czV#klXZq~80n`E~;uYF-T8Sl>86VJ|UW@clDIMjx0z`=1$ z9Fmv>mPdJ{K$`T@sw#y-9|Wibfo)L>LMf_{TBpl_I9t3nEJOu?@IoporTF-X8&|d8I665# zI?4{8XHRkGcyU^c$US?e!}K<;BOD?D!q2W0gp|mqqR{|pymnvly1jcQ$Ht30 zN%7F+zNyX>%^Y7#eJ7SQ<&*(+XlTeTeXX>tz!WhW zRIH3UIW|E8*@CW<3lEJ%B7sJ-b96sW`XXy$fly;GtLbXmQWZzd(091bFTdBC4SX~j zk0(ef-LDvZsvUMr;%;G+MqSBj*hNk2b_kP(O}8BHqTGq5|NC0k%(+&Gr1F-!RWl2A zI0FkwV?d0C?cyX02T$NsIf4HHayVlT+}d53D(;)=`O?4yXv+6f&QJg83)cCAAwNA) zzlLtC&2l63p4!zSA0>9bl2LJwT*x03MbgXMtg1trLxcnwwhD%!8GVtwWu{fzCIU}C z7Fy{?wU<@5TSeRIp1^j$tTX7!`T)*S>enugU$T_$s?S%~w3q)-KaYdzn+>a~bIr7A z-iw$zJFm-|`gGpA9sZz{B%K`{wrXTLI$$9Yq9l+X-8VHhaXkw+Zp6)hsLdb5O){pj z)*&)U>!z({4QPk_PzX827OWPseTe=Q%Nz2CO5UF{iuBN7T(Wcr> zzpBB%CpV2Rqeoi8+(G(u%f^OzBW#j>(30d1)6Ukwx)|v-3$Q#HC${Ra^v*jL;S&Nu za%xT_qv|SBiH}S4rq;HSSh-*%uUNJk=~oecsEZQmgPNIj7xRhgUYe0LVL4yfOfziN za!6dNerM{j*ad45unWwPstXNZThXk!a<5$~>m(RyFx9 z$e`6vHv5Bd0*K`D&Y%WU2Hi90TdNN&$4vw>%8ZY%B3zf)5fgnP7)9T;flj zi1FAgnvrw@MrJ|J81S|%Ut~lS;1-EzEAqo#E+CAKvuzgY)z}dM2|TRi^SFdSngm`Z zCVs=6U&03D!xshEH>A-rPi_=@zPjOlLul3oM`hH_C1K|QDP8;*tpXX{mqQ-{XxWCdf z8_2u{HudX9`pJfeL5;`4U8R*ZK^YOjHG9n=OYPH4gUF&x@`XyuxG|9VvB%nB2eU2d?-zmLr4>Or(}jQ;&AOSu>;BPAIr#&&=wqL)TY z7T}&r-H~}|2J{7Rkl{qMG;?7zN!X99K_n1hl^5I+khA+XVpf>R6e)osp|Yzex()-I zfK;1Eu)0z*h!hj)gVEOO60X73>4NMi4 z;!u9&cr!hnXrOmV6BvCW1-zxN9A8?F$ct++rzBp1tWACo^06eVP+IEekiM(3p6=(} z&2;ptkp|S9LXD4}zbaNg!ZMe(cCTC>gAYstZpeNI*G~D>K1$aLDU!o z1I?SRshO;%>KW*fI8W?C?`Ad4EGD?b41ZUqT}}FQ_m-*^X9<9ZRaz1h9&8BX|m|H+ca5A$!>xwGB<=Tb-ubN!Vy zK>=n~w{qQqrUyn|L==4T5~%TsOO#@B`GrSy#zrMCD_uI_(e!!4DxL7C#Th&AW;&0i z#Y2B3kr8t5dV?fhC4mZ^;j}sEN9;j(vxmX&0-!ToszlZE7n;iG9B`n0iIW_f4ee^y zxm@IrekG6Y4zuXlRCKT2C~zM138BX$?Z z4bZzC2C}Cd0rE|!3(_2JD=#m+1qv$vcW4#cqy97Tu^FI(8_^V2-iNTu)ft~1$5I_Tj?VskC&n{+tL9F(6@?cLWdl)cQZIG zesMz@lVoC`Qdl;LiPdkKk=6?t6*JK}+Q5vXT6s$&F=R9T8a$EFpj9U2Bx{86y`&L2 zfvW2%#95Q>u96v6G3gkE9Fb*~kBXjCbEdV;1%WKFX3yOfSyEku=5}@w`r?WPql@ZZ z5|HFgvqI;T^Vh!3ZEQr&9gqDZzBOuSlvG#5tf(a)YXwwK+LbUEER-bUZw{Vk-=?Kj>9SvMYoe2^}~ zmlu}cG0S{Y?SEKHPFL+2gvP-=>_NO?LWCTd=!SfDd`0=i3614u-Q)+5A5VsmuI)D+ z@*(wwBx@1rQ&U&q%P*!fkX!aGrA_;P1Y3|no*%#&?3v-FXp#iFy90P}1bTYb;TMiR zzyB=OJ$Lhjhow`8R?_ymBz@_gMfCmy?8t)$3+|`#xq}OtA%8p6;;EiH*g_XgpTpGK z(|w*w_?GW8l{1IedE?IxpRT>K^44VU;|;7*;^U(0!$eRyAMx$*7+ z4(^djPSNzNspI+QIrYQ)+UcG5ypA>7@9p