From bda5cf160614411162cddf56419d21208c513f56 Mon Sep 17 00:00:00 2001 From: rmkaplan <69548581+rmkaplan@users.noreply.github.com> Date: Thu, 11 Apr 2024 15:41:37 -0700 Subject: [PATCH] DINFO: recreate textstream if it has disappeared from the window (#1659) Not sure how this can happen--a Tedit window without a textstream--but now testing for it. DINFO must have removed it for some unknown reason. --- lispusers/DINFO | 16 +++++++++------- lispusers/DINFO.LCOM | Bin 29912 -> 29915 bytes 2 files changed, 9 insertions(+), 7 deletions(-) diff --git a/lispusers/DINFO b/lispusers/DINFO index d098e760..37a6c501 100644 --- a/lispusers/DINFO +++ b/lispusers/DINFO @@ -1,12 +1,12 @@ (DEFINE-FILE-INFO PACKAGE "INTERLISP" READTABLE "INTERLISP" BASE 10) -(FILECREATED "10-Mar-2024 15:38:36" {WMEDLEY}DINFO.;12 65343 +(FILECREATED "11-Apr-2024 08:27:34" {WMEDLEY}DINFO.;13 65523 :EDIT-BY rmk :CHANGES-TO (FNS DINFO.OPENTEXTSTREAM) - :PREVIOUS-DATE " 9-Mar-2024 22:21:42" {WMEDLEY}DINFO.;10) + :PREVIOUS-DATE "10-Mar-2024 15:38:36" {WMEDLEY}DINFO.;12) (PRETTYCOMPRINT DINFOCOMS) @@ -1036,18 +1036,20 @@ (PROMPTPRINT "DInfo is busy"]) (DINFO.OPENTEXTSTREAM - [LAMBDA (FILE WINDOW FROM TO PROPS) (* ; "Edited 10-Mar-2024 15:37 by rmk") + [LAMBDA (FILE WINDOW FROM TO PROPS) (* ; "Edited 10-Apr-2024 23:46 by rmk") + (* ; "Edited 10-Mar-2024 15:37 by rmk") (* drc%: "25-Jan-86 18:24") (RESETFORM (TTYDISPLAYSTREAM (GETPROMPTWINDOW WINDOW)) (LET ((TEXTSTREAM (WINDOWPROP WINDOW 'TEXTSTREAM)) (THIS.TEXT (LIST FILE FROM TO))) - (if (AND (EQUAL THIS.TEXT (fetch (DINFOGRAPH LAST.TEXT) of (DINFOGRAPH WINDOW))) + (if (AND TEXTSTREAM (EQUAL THIS.TEXT (fetch (DINFOGRAPH LAST.TEXT) + of (DINFOGRAPH WINDOW))) (\GETSTREAM TEXTSTREAM 'INPUT T)) then (* ;; "Same text, and it's still there and open, so do nothing.") TEXTSTREAM - else (AND TEXTSTREAM (TEDIT.KILL TEXTSTREAM)) + else (CL:WHEN TEXTSTREAM (TEDIT.KILL TEXTSTREAM)) (CLEARW T) (CLEARW WINDOW) [RESETSAVE NIL `(AND RESETSTATE (WINDOWPROP ,WINDOW 'LAST.TEXT NIL] @@ -1122,7 +1124,7 @@ DINFO.UPDATE.FROM.MENU 44874 . 45173) (DINFO.UPDATE.HISTORY 45175 . 47705) (DINF 47707 . 48534)) (48537 58866 (DINFO.UPDATE.GRAPH.DISPLAY 48547 . 49999) (DINFO.UPDATE.FROM.GRAPH 50001 . 50477) (DINFO.GET.GRAPH.WINDOW 50479 . 51064) (DINFO.CREATE.GRAPH.WINDOW 51066 . 52183) ( DINFO.SHOWGRAPH 52185 . 53910) (DINFO.INVERT.NODE 53912 . 55300) (DINFO.LAYOUTGRAPH 55302 . 58864)) ( -58867 64756 (DINFO.UPDATE.TEXT.DISPLAY 58877 . 60825) (DINFO.TITLEMENUFN 60827 . 61952) ( -DINFO.OPENTEXTSTREAM 61954 . 63116) (DINFO.SHOWSEL 63118 . 63851) (DINFO.GET.FILENAME 63853 . 64754))) +58867 64936 (DINFO.UPDATE.TEXT.DISPLAY 58877 . 60825) (DINFO.TITLEMENUFN 60827 . 61952) ( +DINFO.OPENTEXTSTREAM 61954 . 63296) (DINFO.SHOWSEL 63298 . 64031) (DINFO.GET.FILENAME 64033 . 64934))) )) STOP diff --git a/lispusers/DINFO.LCOM b/lispusers/DINFO.LCOM index fb0cdd1e5f39e6d591a9e9ecedeeb015bad41bce..503546fef8125e27cbdf97106b7cd5e3b22bebad 100644 GIT binary patch delta 387 zcmZvXy-LGS6vw%U6*{`Plt0(S3XQq<=C(<;nB26%Gzn=+3c3h&P^5lP(9K;Ol)Q;` z^d;N`pP+By?NE*2ayW4QAHVatBwtJNJlSR)@A|gGO>V)oUGBKn%f-QiXroEt{N9-3 z3h8o2LH%@?MX~CHdQ2(KXQ1IYj!~BzhCwksou5tdUyP*f=HANh=gKQo0LuPwG+f?u zg;ljkt0B;pl2?bMUp0wXypy*}@>Jc-b~XmD`_<#@F1HaxNtpI?FB^byjxY%;d5Ny`vvKI&s4$KqjV>8Z`f9BgW_9oH9y1~8!H$VCN`kb^@-%}jk*m?l hqWNK)@R9(QM3iLX0z%fEQdg~E^xts0i;t_V&2O^=qN5O<>QKAhs5OG+~#MC$!!egk2IwPT?%nfB%%nqIXehS1|Ou3 zK8Azf6Z9>-9g0C*4hPQnd%joXYein>+lH1dZZ&2w3#Rb6$*-+FYeB3{3j#muz#@T2c`5Y8U6u@_KocKFcREq zk4Urw_ctVC9#cVBJ0JsMEI-Km6?tlJn%(xfxi1C6I2-3t=@-W^O&56~vr5jZNu``p z*bG4;{c?uUXtN0yDneZ8C$VZ_IXH{t2G8vFA=o=LxzQDNY|P>;%x6WJ7jPI#IayOw g71%cXEQG}nXT`JvXI-XHR+}*D1#tQD^LnfI1Fn8%g#Z8m