From 6f2c51e19fef12fa459a8a375f779ad36c9c8be6 Mon Sep 17 00:00:00 2001 From: rmkaplan Date: Sat, 7 Feb 2026 21:32:02 -0800 Subject: [PATCH] TEDIT-SCREEN don't use TTY displaystream if formatting without a window --- library/tedit/TEDIT-SCREEN | 47 +++++++++++++++++--------------- library/tedit/TEDIT-SCREEN.LCOM | Bin 33515 -> 33574 bytes 2 files changed, 25 insertions(+), 22 deletions(-) diff --git a/library/tedit/TEDIT-SCREEN b/library/tedit/TEDIT-SCREEN index c5d199f0..4c33bbac 100644 --- a/library/tedit/TEDIT-SCREEN +++ b/library/tedit/TEDIT-SCREEN @@ -1,12 +1,12 @@ (DEFINE-FILE-INFO PACKAGE "INTERLISP" READTABLE "INTERLISP" BASE 10) -(FILECREATED "31-Dec-2025 23:10:18" {WMEDLEY}tedit>TEDIT-SCREEN.;915 186658 +(FILECREATED " 5-Feb-2026 00:39:54" {WMEDLEY}TEDIT>TEDIT-SCREEN.;916 186880 :EDIT-BY rmk - :CHANGES-TO (VARS TEDIT-SCREENCOMS) + :CHANGES-TO (FNS \TEDIT.FORMATLINE) - :PREVIOUS-DATE " 7-Dec-2025 16:28:01" {WMEDLEY}tedit>TEDIT-SCREEN.;914) + :PREVIOUS-DATE "31-Dec-2025 23:10:18" {WMEDLEY}TEDIT>TEDIT-SCREEN.;915) (PRETTYCOMPRINT TEDIT-SCREENCOMS) @@ -654,6 +654,7 @@ (\TEDIT.FORMATLINE [LAMBDA (TSTREAM CH#1 LINE REGION IMAGESTREAM FORMATTINGSTATE) + (* ; "Edited 5-Feb-2026 00:38 by rmk") (* ; "Edited 21-Nov-2025 16:36 by rmk") (* ; "Edited 7-Aug-2025 12:49 by rmk") (* ; "Edited 27-Apr-2025 11:24 by rmk") @@ -706,8 +707,10 @@ (CL:UNLESS LINE (SETQ LINE (create LINEDESCRIPTOR))) (CL:UNLESS IMAGESTREAM - (SETQ IMAGESTREAM (WINDOWPROP (\TEDIT.PRIMARYPANE TSTREAM) - 'DSP))) + (SETQ IMAGESTREAM (CL:IF (\TEDIT.PRIMARYPANE TSTREAM) + (WINDOWPROP (\TEDIT.PRIMARYPANE TSTREAM) + 'DSP) + (DSPCREATE)))) (PROG ((TEXTOBJ (FTEXTOBJ TSTREAM)) (OFFSET 0) (TRUEASCENT -1) @@ -2863,21 +2866,21 @@ (\TEDIT.LINE.TALLP LINE PHEIGHT))))]) ) (DECLARE%: DONTCOPY - (FILEMAP (NIL (26200 28416 (\TEDIT.LINEDESCRIPTOR.DEFPRINT 26210 . 28414)) (35870 119502 ( -\TEDIT.FORMATLINE 35880 . 70986) (\TEDIT.FORMATLINE.SETUP.PARA 70988 . 76182) ( -\TEDIT.FORMATLINE.HORIZONTAL 76184 . 81001) (\TEDIT.FORMATLINE.VERTICAL 81003 . 83454) ( -\TEDIT.FORMATLINE.JUSTIFY 83456 . 89477) (\TEDIT.FORMATLINE.TABS 89479 . 97507) (\TEDIT.SCALE.TABS -97509 . 98300) (\TEDIT.FORMATLINE.PURGE.SPACES 98302 . 99729) (\TEDIT.FORMATLINE.FLUSH.SOFTHYPHEN -99731 . 100808) (\TEDIT.FORMATLINE.EMPTY 100810 . 105630) (\TEDIT.FORMATLINE.UPDATELOOKS 105632 . -111813) (\TEDIT.FORMATLINE.LASTLEGAL 111815 . 115265) (\TEDIT.LINES.ABOVE 115267 . 118878) ( -\TEDIT.CHNO.TO.YTOP 118880 . 119500)) (119779 140359 (\TEDIT.DISPLAYLINE 119789 . 132299) ( -\TEDIT.DISPLAYLINE.TABS 132301 . 135105) (\TEDIT.LINECACHE 135107 . 135835) (\TEDIT.CREATE.LINECACHE -135837 . 136673) (\TEDIT.BLTCHAR 136675 . 139302) (\TEDIT.DIACRITIC.SHIFT 139304 . 140357)) (140974 -186635 (\TEDIT.BACKFORMAT 140984 . 143538) (\TEDIT.PREVIOUS.LINEBREAK 143540 . 146343) ( -\TEDIT.UPDATE.LINES 146345 . 152651) (\TEDIT.PANE.CREATELINES 152653 . 154943) ( -\TEDIT.SUFFIXLINE.CREATE 154945 . 156560) (\TEDIT.LINES.BELOW 156562 . 161172) (\TEDIT.MEASURED.LINES -161174 . 163183) (\TEDIT.VALID.LASTCHNOS 163185 . 166961) (\TEDIT.VALID.NEXTCHNOS 166963 . 170437) ( -\TEDIT.LASTVALIDLINE 170439 . 175110) (\TEDIT.NEXTVALIDLINE 175112 . 178082) ( -\TEDIT.CLEARPANE.BELOW.LINE 178084 . 180190) (\TEDIT.INSERTLINE 180192 . 181578) (\TEDIT.LINE.BOTTOM -181580 . 184810) (\TEDIT.SHOW.AT.BOTTOMP 184812 . 185922) (\TEDIT.SHOW.AT.TOPP 185924 . 186633))))) + (FILEMAP (NIL (26200 28416 (\TEDIT.LINEDESCRIPTOR.DEFPRINT 26210 . 28414)) (35870 119724 ( +\TEDIT.FORMATLINE 35880 . 71208) (\TEDIT.FORMATLINE.SETUP.PARA 71210 . 76404) ( +\TEDIT.FORMATLINE.HORIZONTAL 76406 . 81223) (\TEDIT.FORMATLINE.VERTICAL 81225 . 83676) ( +\TEDIT.FORMATLINE.JUSTIFY 83678 . 89699) (\TEDIT.FORMATLINE.TABS 89701 . 97729) (\TEDIT.SCALE.TABS +97731 . 98522) (\TEDIT.FORMATLINE.PURGE.SPACES 98524 . 99951) (\TEDIT.FORMATLINE.FLUSH.SOFTHYPHEN +99953 . 101030) (\TEDIT.FORMATLINE.EMPTY 101032 . 105852) (\TEDIT.FORMATLINE.UPDATELOOKS 105854 . +112035) (\TEDIT.FORMATLINE.LASTLEGAL 112037 . 115487) (\TEDIT.LINES.ABOVE 115489 . 119100) ( +\TEDIT.CHNO.TO.YTOP 119102 . 119722)) (120001 140581 (\TEDIT.DISPLAYLINE 120011 . 132521) ( +\TEDIT.DISPLAYLINE.TABS 132523 . 135327) (\TEDIT.LINECACHE 135329 . 136057) (\TEDIT.CREATE.LINECACHE +136059 . 136895) (\TEDIT.BLTCHAR 136897 . 139524) (\TEDIT.DIACRITIC.SHIFT 139526 . 140579)) (141196 +186857 (\TEDIT.BACKFORMAT 141206 . 143760) (\TEDIT.PREVIOUS.LINEBREAK 143762 . 146565) ( +\TEDIT.UPDATE.LINES 146567 . 152873) (\TEDIT.PANE.CREATELINES 152875 . 155165) ( +\TEDIT.SUFFIXLINE.CREATE 155167 . 156782) (\TEDIT.LINES.BELOW 156784 . 161394) (\TEDIT.MEASURED.LINES +161396 . 163405) (\TEDIT.VALID.LASTCHNOS 163407 . 167183) (\TEDIT.VALID.NEXTCHNOS 167185 . 170659) ( +\TEDIT.LASTVALIDLINE 170661 . 175332) (\TEDIT.NEXTVALIDLINE 175334 . 178304) ( +\TEDIT.CLEARPANE.BELOW.LINE 178306 . 180412) (\TEDIT.INSERTLINE 180414 . 181800) (\TEDIT.LINE.BOTTOM +181802 . 185032) (\TEDIT.SHOW.AT.BOTTOMP 185034 . 186144) (\TEDIT.SHOW.AT.TOPP 186146 . 186855))))) STOP diff --git a/library/tedit/TEDIT-SCREEN.LCOM b/library/tedit/TEDIT-SCREEN.LCOM index 5181485e0f04e6c19aed9a1889d677d48154872c..93232968f7c007b0b40f655fea9db0cd075a7e54 100644 GIT binary patch delta 1388 zcmZuxOOMl56egKWr_3OsDp3gZ!6AaeEXH#mzV^MLDtPSc#NgPL?Q|v;i$Y;B0jvGzheee%VF-8+wNKY|}BxJN+)m6nvG*lm1r$&WHP0(2b)NvgjJ;z_pQVb9`1 zqgVXdXrDQL3*z9v#<$Cje~M&f^W%f_*H50n-%r(}wEsHs-vc)s#tt;u-tS-W>y zm~hMgTBmUW3>R5Aopy1}SZgt6OOnRpBu~;H%7Jl(`PG8mk&|W`eM}+5MIWCb{k$pg z(S;VH%&wcPG;LX$zjfA{xZFS5o#IvJbknT7`<)M#EK+7IQ6Y=#ol7lh^4X{t_b4|h z_`yyJloMWCjMxy2ouQ7mZXnhKD3zpsM@@5X5w;LTW}AH{63jhs>hN&I~aRi(Q zs7xeWR$KekICa_N;00L{I@2sifsgSm!)`T4ZXUZM)T=Dsbk7ZOOZAJIWSf+o%8LOO zjub@MB-PtNc4nv5l6@ei>awr9qWLngO8f|-y68bO=Zp~b{Px#cNv#)>z_ z*^t?+ggfuUENdYchcwmuBT>8@RTqV8(>pn;6l_)e(!0DQh+X{K`*c-uxIzhPdcF9l Q)h_nGKXq{a?BBcp19?kd0{{R3 delta 1455 zcmZ`(&2QX96lX(GlvDwsEGu#Vy;zl+t=P@X_+!SVityUwT^Fy%vb{~V$|a-$R!y@g z+6zJ`;sEDXK5{}rTzkkJ(L)dY3pjHHapi`@TYK}h2|ifw&AgA_d++z=mme1X`hMZr zc3r0}|6sqx2s44{4kZp1&!61coE$tJO}29Bhj}aWQYqv1$2K*au&n9i!i5OOG#uT2 z{%d3ZXgv9Hbo2#`jz9|rQ3RI_+wHankM}U_jS&p4HJ3MnFp`+d#k8Q^gsgCD^^^aB z22@y^q<=PTeVlkqs7gY7oRM>fnWK1efsm_ zv)fH#!)}S99mZMiMo~Knr6+;e27%q+kxW&B3Sq@}_0{65)s+Qdmg0}?r7b3O9Rd~S zo=S$mxWzAAxPD2ojPo>JFIR~N%oN2R^?LF5>SE1AY29OnZC4FxC#mWud6I^4jzr+- zTTKG{mu3>rm_TszXRN~b@4a_#F=|W|ZGq}juuHky$$;9HQM{~wSmVXZ#(TwKW91gL zbmNkNX-~c2O=?;NU9T6@P#CEy7?l&MGY&zxlLBSJo=Mc!A?&+dsX7l3c>jC9uXHO(fa)|9hHdOaB0+4VP>F1mpX-I8){d#!wF2L6isTWJ)2U_do=!yZ(dJr&TT`MvgThR9&6err)ru%COO=FU+vHA;JO#@v{(S%L vJp;L`MWdqwn2g78IL0S)GKSB`$4~br_(%%Nh7H6>^=9$g2lZ36_WS5R(K~xT