From 58aad924d24a68b192e7447ef4ee944a98e741bd Mon Sep 17 00:00:00 2001 From: rmkaplan <69548581+rmkaplan@users.noreply.github.com> Date: Wed, 9 Apr 2025 11:44:45 -0700 Subject: [PATCH] Initial TEDIT window based on Lisp-source width estimate TEDIT.SOURCE.LINELENGTH (#2089) --- lispusers/COMPAREDIRECTORIES | 83 +++++++++++++------ lispusers/COMPAREDIRECTORIES.LCOM | Bin 41558 -> 41839 bytes lispusers/EXAMINEDEFS | 28 ++++--- lispusers/EXAMINEDEFS.LCOM | Bin 5518 -> 5558 bytes lispusers/TEDIT-PF-SEE | 133 ++++++++++++++++-------------- lispusers/TEDIT-PF-SEE.LCOM | Bin 5281 -> 5382 bytes 6 files changed, 141 insertions(+), 103 deletions(-) diff --git a/lispusers/COMPAREDIRECTORIES b/lispusers/COMPAREDIRECTORIES index c37aeb31..b9f3ee30 100644 --- a/lispusers/COMPAREDIRECTORIES +++ b/lispusers/COMPAREDIRECTORIES @@ -1,12 +1,13 @@ (DEFINE-FILE-INFO PACKAGE "INTERLISP" READTABLE "INTERLISP" BASE 10) -(FILECREATED "20-Jan-2025 11:00:54" {WMEDLEY}COMPAREDIRECTORIES.;263 131893 +(FILECREATED "26-Mar-2025 09:41:31" {WMEDLEY}COMPAREDIRECTORIES.;267 133447 :EDIT-BY rmk :CHANGES-TO (VARS COMPAREDIRECTORIESCOMS) + (FNS CD-MENUFN) - :PREVIOUS-DATE "23-Dec-2024 23:54:13" {WMEDLEY}COMPAREDIRECTORIES.;262) + :PREVIOUS-DATE "18-Feb-2025 23:37:14" {WMEDLEY}COMPAREDIRECTORIES.;264) (PRETTYCOMPRINT COMPAREDIRECTORIESCOMS) @@ -52,6 +53,7 @@ CDTABLEBROWSER.HEADING.REPAINTFN) (FNS CDTABLEBROWSER.WHENSELECTEDFN CD.COMMANDSELECTEDFN CD-MENUFN CD-COMPARE-FILES CDBROWSER-COPY CDBROWSER-DELETE-FILE CD-SWAPDIRS) + (INITVARS (CD-LINELENGTH NIL)) (VARS CDTABLEBROWSER.MENUITEMS) (FILES (SYSLOAD) COMPARESOURCES COMPARETEXT) @@ -1960,6 +1962,10 @@ (CD-MENUFN [LAMBDA (TBITEM MENUITEM CDBROWSER KEY) + (* ;; "Edited 26-Mar-2025 09:39 by rmk") + + (* ;; "Edited 18-Feb-2025 23:36 by rmk") + (* ;; "Edited 23-Dec-2024 23:53 by rmk") (* ;; "Edited 21-May-2022 21:59 by rmk") @@ -1974,7 +1980,10 @@ (CL:WHEN (MEMB MENUITEM '(Compare See See% right See% both See% left)) (* ; "Close the previous ones") (CLOSEWITH.DOIT WINDOW)) - (LET (CHILDREN) + (LET ((SOURCEWIDTH (ITIMES (OR CD-LINELENGTH TEDIT.SOURCE.LINELENGTH) + (CHARWIDTH (CHARCODE SPACE) + DEFAULTFONT))) + CHILDREN) (SETQ CHILDREN (SELECTQ MENUITEM (Compare (IF (AND FILE1 FILE2) @@ -1987,7 +1996,13 @@ THEN (if (PDFFILEP FILE1) then (SEE-PDF FILE1) else (TEDIT-SEE FILE1 (RELCREATEREGION - 700 700 'RIGHT 'TOP `(,WINDOW 0.5) + (CL:IF (LISPSOURCEFILEP FILE1) + SOURCEWIDTH + 700) + 700 + 'RIGHT + 'TOP + `(,WINDOW 0.5) (IPLUS (FETCH (REGION BOTTOM) OF (WINDOWPROP WINDOW 'REGION)) @@ -2001,7 +2016,13 @@ THEN (if (PDFFILEP FILE2) then (SEE-PDF FILE2) else (TEDIT-SEE FILE2 (RELCREATEREGION - 700 700 'LEFT 'TOP `(,WINDOW 0.5) + (CL:IF (LISPSOURCEFILEP FILE2) + SOURCEWIDTH + 700) + 700 + 'LEFT + 'TOP + `(,WINDOW 0.5) (IPLUS (FETCH (REGION BOTTOM) OF (WINDOWPROP WINDOW 'REGION)) @@ -2019,7 +2040,13 @@ elseif (PDFFILEP FILE2) then (SEE-PDF FILE2) else (EXAMINEFILES FILE1 FILE2 LABEL1 LABEL2 - (RELCREATEREGION 1400 700 'LEFT 'TOP `(,WINDOW 0.5 -701) + (RELCREATEREGION (ITIMES 2 (CL:IF (LISPSOURCEFILEP FILE1) + SOURCEWIDTH + 700)) + 700 + 'LEFT + 'TOP + `(,WINDOW 0.5 -701) (IPLUS (FETCH (REGION BOTTOM) OF (WINDOWPROP WINDOW 'REGION)) -1) @@ -2208,6 +2235,8 @@ ELSE (ERROR FILE (CONCAT " doesn't begin with " FROMDIR]) ) +(RPAQ? CD-LINELENGTH NIL) + (RPAQQ CDTABLEBROWSER.MENUITEMS ((Compare CD-MENUFN) (Copy% -> CD-MENUFN) (Copy% <- CD-MENUFN) @@ -2221,25 +2250,25 @@ (MOVD? 'NILL 'TEDIT.FILEDATE) (DECLARE%: DONTCOPY - (FILEMAP (NIL (2622 22985 (COMPAREDIRECTORIES 2632 . 7967) (COMPAREDIRECTORIES.INFOS 7969 . 10927) ( -COMPAREDIRECTORIES.CANDIDATES 10929 . 14314) (CDENTRIES.SELECT 14316 . 19091) ( -COMPAREDIRECTORIES.INFOS.TYPE 19093 . 20219) (MATCHNAME 20221 . 20901) (CD.INSURECDVALUE 20903 . 22517 -) (CD.UPDATEWIDTHS 22519 . 22983)) (22986 33608 (CDFILES 22996 . 29010) (CDFILES.MATCH 29012 . 30637) -(CDFILES.PATS 30639 . 33606)) (33609 51430 (CDPRINT 33619 . 36136) (CDPRINT.HEADER 36138 . 37035) ( -CDPRINT.LINE 37037 . 40269) (CDPRINT.MAXWIDTHS 40271 . 44386) (CDPRINT.COLHEADERS 44388 . 45673) ( -CDPRINT.COLUMNS 45675 . 50795) (CDTEDIT 50797 . 51428)) (51431 60552 (CDMAP 51441 . 52873) (CDENTRY -52875 . 53184) (CDSUBSET 53186 . 54625) (CDMERGE 54627 . 58611) (CDMERGE.COMMON 58613 . 59928) ( -CD.SORT 59930 . 60550)) (60553 68091 (BINCOMP 60563 . 64852) (EOLTYPE 64854 . 67416) (EOLTYPE.SHOW -67418 . 68089)) (68619 81146 (FIND-UNCOMPILED-FILES 68629 . 72272) (FIND-UNSOURCED-FILES 72274 . 74658 -) (FIND-SOURCE-FILES 74660 . 76398) (FIND-COMPILED-FILES 76400 . 78277) (FIND-UNLOADED-FILES 78279 . -79132) (FIND-LOADED-FILES 79134 . 79562) (FIND-MULTICOMPILED-FILES 79564 . 81144)) (81147 89578 ( -CREATED-AS 81157 . 85954) (SOURCE-FOR-COMPILED-P 85956 . 88883) (COMPILE-SOURCE-DATE-DIFF 88885 . -89576)) (89579 100342 (FIX-DIRECTORY-DATES 89589 . 93039) (FIX-EQUIV-DATES 93041 . 94566) ( -COPY-COMPARED-FILES 94568 . 96389) (COPY-MISSING-FILES 96391 . 98548) (COMPILED-ON-SAME-SOURCE 98550 - . 100340)) (100536 108374 (CDBROWSER 100546 . 104473) (CDBROWSER.STRINGS 104475 . 108372)) (108536 -110272 (CD.TABLEITEM 108546 . 108766) (CD.TABLEITEM.PRINTFN 108768 . 108967) (CD.TABLEITEM.COPYFN -108969 . 110027) (CDTABLEBROWSER.HEADING.REPAINTFN 110029 . 110270)) (110273 131399 ( -CDTABLEBROWSER.WHENSELECTEDFN 110283 . 110751) (CD.COMMANDSELECTEDFN 110753 . 115854) (CD-MENUFN -115856 . 120638) (CD-COMPARE-FILES 120640 . 123992) (CDBROWSER-COPY 123994 . 127663) ( -CDBROWSER-DELETE-FILE 127665 . 130878) (CD-SWAPDIRS 130880 . 131397))))) + (FILEMAP (NIL (2701 23064 (COMPAREDIRECTORIES 2711 . 8046) (COMPAREDIRECTORIES.INFOS 8048 . 11006) ( +COMPAREDIRECTORIES.CANDIDATES 11008 . 14393) (CDENTRIES.SELECT 14395 . 19170) ( +COMPAREDIRECTORIES.INFOS.TYPE 19172 . 20298) (MATCHNAME 20300 . 20980) (CD.INSURECDVALUE 20982 . 22596 +) (CD.UPDATEWIDTHS 22598 . 23062)) (23065 33687 (CDFILES 23075 . 29089) (CDFILES.MATCH 29091 . 30716) +(CDFILES.PATS 30718 . 33685)) (33688 51509 (CDPRINT 33698 . 36215) (CDPRINT.HEADER 36217 . 37114) ( +CDPRINT.LINE 37116 . 40348) (CDPRINT.MAXWIDTHS 40350 . 44465) (CDPRINT.COLHEADERS 44467 . 45752) ( +CDPRINT.COLUMNS 45754 . 50874) (CDTEDIT 50876 . 51507)) (51510 60631 (CDMAP 51520 . 52952) (CDENTRY +52954 . 53263) (CDSUBSET 53265 . 54704) (CDMERGE 54706 . 58690) (CDMERGE.COMMON 58692 . 60007) ( +CD.SORT 60009 . 60629)) (60632 68170 (BINCOMP 60642 . 64931) (EOLTYPE 64933 . 67495) (EOLTYPE.SHOW +67497 . 68168)) (68698 81225 (FIND-UNCOMPILED-FILES 68708 . 72351) (FIND-UNSOURCED-FILES 72353 . 74737 +) (FIND-SOURCE-FILES 74739 . 76477) (FIND-COMPILED-FILES 76479 . 78356) (FIND-UNLOADED-FILES 78358 . +79211) (FIND-LOADED-FILES 79213 . 79641) (FIND-MULTICOMPILED-FILES 79643 . 81223)) (81226 89657 ( +CREATED-AS 81236 . 86033) (SOURCE-FOR-COMPILED-P 86035 . 88962) (COMPILE-SOURCE-DATE-DIFF 88964 . +89655)) (89658 100421 (FIX-DIRECTORY-DATES 89668 . 93118) (FIX-EQUIV-DATES 93120 . 94645) ( +COPY-COMPARED-FILES 94647 . 96468) (COPY-MISSING-FILES 96470 . 98627) (COMPILED-ON-SAME-SOURCE 98629 + . 100419)) (100615 108453 (CDBROWSER 100625 . 104552) (CDBROWSER.STRINGS 104554 . 108451)) (108615 +110351 (CD.TABLEITEM 108625 . 108845) (CD.TABLEITEM.PRINTFN 108847 . 109046) (CD.TABLEITEM.COPYFN +109048 . 110106) (CDTABLEBROWSER.HEADING.REPAINTFN 110108 . 110349)) (110352 132922 ( +CDTABLEBROWSER.WHENSELECTEDFN 110362 . 110830) (CD.COMMANDSELECTEDFN 110832 . 115933) (CD-MENUFN +115935 . 122161) (CD-COMPARE-FILES 122163 . 125515) (CDBROWSER-COPY 125517 . 129186) ( +CDBROWSER-DELETE-FILE 129188 . 132401) (CD-SWAPDIRS 132403 . 132920))))) STOP diff --git a/lispusers/COMPAREDIRECTORIES.LCOM b/lispusers/COMPAREDIRECTORIES.LCOM index 96d8992c17f30b10f45237b7e8c736d81bcb9cef..47036b4e4b8af6fce72999ea36da420ff68489c9 100644 GIT binary patch delta 2010 zcmb7F-D@LN6i;UB>c*|?7jCzR90G+zob23t=QFIU)6Aq9n9PKkNwWoCx+dKQ+or_8 zBD)e;5f^;11ZAIAebl$M+c%*KBKR&M`{0w0F8UwnnYoiRZTH0x=AOCdMabppaV248qVD|gYNuj}b=zxJJ?L&h zzS?wMm^LkyN_l9n4m$1U#-Jo$%oVDRYgYo>jBE=|0&y1i-h4>|!k8>;qs^?L6{=nc z6X+t88-cy-_{~tXFbd>}E>=6Y`B5kE*;u

R22mN-3%l4UphN7PQFo!Wyf;d}fi{>dXq{N~57 zLU!}t-@CIf#^CFTs+nM(PuOI?n6UofFyz=VG~#D6DYz{u6)=E1_ zI5>Q{kSVCL0(E~Gn-5z?Wja(`KODbdXV(0tYhj0|R32S_c=e1b5nSg4%}5p{-klpV zip{qe_^r?m#ERco0Y$=4$G2o%1^bp+#}$J17xB@Xxn1L!h1o;5Ku@p5}jz6Ass20&W;qCGNq8ydm>^)U^0V> z?^VnQ7$c|XF`}KIM|A~;C;3qX81tj5egsBUq!c(F1B$R!*9>dvF)7Zze$O9&b`dZzg4ay(xue!XD^ zw#W;prL`JP6$>Yu86=|&D2}9YH0{Pg+b(FkBx&d6^q&FEWqvFU>%sE#&5tRIWeP#f%T6mQI^{EyLZ+H zKy;EA5X=$>Cj?tC4z$r(8z5Q4+}vL6cQ74@YCu6MDIjVRDPr$wkdOQEZg;EQy9;Z* zKIDPnl#Y#xK+!wz^cfI|`!~Ot%l-#}_~UN? delta 1706 zcmZ`)-)kd99M7(IRfCnD!rk@6<4ds69&Fh8vB_?zLYizYtJ`e4n>0NXp=Y*Du$Pn) zIE7+B(Gyg-V?pk%qHn&ny?Z-|4~KZ1&vFmS;j<6=ALw^yl3vrsJj~3_XFfk>zO$RZ ze^!5csNP<;n{T2qUJ&qOM}S zk*oUls^irIt%yYAF|8PW5NGE=83xZ07X7Yh3O!7!mp@DDP$)ZY(YGtn(&wa4py5=C zUIR)%Ar62oFfk%H;^5|&Y&RYnav0+os9met3!v7Osl=JQsw(%-(mt#963Yp#f0mSs1Sm^UmA%igNpaB5{R%q$dKFBm>$ zEeOh9-7QvXU}RbJ$CtB;j_pO2nxfO=xeI-65-1dxe6JDMzE<$6*MJ+SbYhAbV6Wwu zor)dbt^hc-z_(p_&wcx<<5hqY1Kx8gLEXm;;x@84g>7rqBHqR<1?*#b6LzOBg`7}mI91Yf=0H*lrzTrFeO4HI^Y;a1oSA&(z2?X6uf@N|bLhLhkN zB4AJou3bVFp<}E?Z5KG6g8(_k8<7?@;22V>aol{NyZ!N8AL4mqD8@OH)3F8DDbzfy z{YZ_`3F7_vdE2)9l`ajqVPlfM$tUgg8b@Rl2az-U^}D zh3%bor#i;hf`NK=!T~QC; I|NflvABJ(B_5c6? diff --git a/lispusers/EXAMINEDEFS b/lispusers/EXAMINEDEFS index 927f9ce4..29d693b8 100644 --- a/lispusers/EXAMINEDEFS +++ b/lispusers/EXAMINEDEFS @@ -1,14 +1,12 @@ (DEFINE-FILE-INFO PACKAGE "INTERLISP" READTABLE "INTERLISP" BASE 10) -(FILECREATED "20-Jan-2025 22:00:44" {WMEDLEY}EXAMINEDEFS.;54 16352 +(FILECREATED "31-Mar-2025 13:53:38" {WMEDLEY}EXAMINEDEFS.;56 16674 :EDIT-BY rmk - :CHANGES-TO (FNS EXVV EXV) - (COMMANDS exv) - (VARS EXAMINEDEFSCOMS) + :CHANGES-TO (FNS EXAMINEDEFS) - :PREVIOUS-DATE "12-Dec-2024 15:09:08" {WMEDLEY}EXAMINEDEFS.;53) + :PREVIOUS-DATE "18-Feb-2025 23:01:57" {WMEDLEY}EXAMINEDEFS.;55) (PRETTYCOMPRINT EXAMINEDEFSCOMS) @@ -22,7 +20,9 @@ (DEFINEQ (EXAMINEDEFS - [LAMBDA (NAME TYPE SOURCE1 SOURCE2 TITLE1 TITLE2 REGION) (* ; "Edited 6-Dec-2024 20:51 by rmk") + [LAMBDA (NAME TYPE SOURCE1 SOURCE2 TITLE1 TITLE2 REGION) (* ; "Edited 31-Mar-2025 13:53 by rmk") + (* ; "Edited 18-Feb-2025 22:56 by rmk") + (* ; "Edited 6-Dec-2024 20:51 by rmk") (* ; "Edited 13-Oct-2023 11:11 by rmk") (* ; "Edited 18-May-2023 22:35 by rmk") (* ; "Edited 21-Apr-2023 14:42 by rmk") @@ -140,11 +140,13 @@ W1 'PROCESS)) (CONS W2 (WINDOWPROP W2 'PROCESS]) - (COMPARETEXT [LET (COMPARETEXT.ALLCHUNKS CTWINDOW - (KEY (LIST NAME TYPE SOURCE1 SOURCE2 TITLE1 - TITLE2)) - (TEXTWIDTH 700) - (TEXTHEIGHT 600)) + (COMPARETEXT [LET (COMPARETEXT.ALLCHUNKS + CTWINDOW + (KEY (LIST NAME TYPE SOURCE1 SOURCE2 TITLE1 TITLE2)) + (TEXTWIDTH (ITIMES TEDIT.SOURCE.LINELENGTH + (CHARWIDTH (CHARCODE SPACE) + DEFAULTFONT))) + (TEXTHEIGHT 600)) (DECLARE (SPECVARS COMPARETEXT.ALLCHUNKS)) (* ;  "Reuse an existing CT graph window for this DEF") @@ -278,6 +280,6 @@ (FILESLOAD (SYSLOAD) COMPARETEXT VERSIONDEFS) (DECLARE%: DONTCOPY - (FILEMAP (NIL (736 16121 (EXAMINEDEFS 746 . 10675) (EXAMINEFILES 10677 . 12159) (TEDITDEF 12161 . -14327) (EXVV 14329 . 16119))))) + (FILEMAP (NIL (665 16443 (EXAMINEDEFS 675 . 10997) (EXAMINEFILES 10999 . 12481) (TEDITDEF 12483 . +14649) (EXVV 14651 . 16441))))) STOP diff --git a/lispusers/EXAMINEDEFS.LCOM b/lispusers/EXAMINEDEFS.LCOM index 3433abf86f6d97073df520178e236bf9676d496d..350ffb06c8c7a260b94390bcd0b63c7c5e02ba19 100644 GIT binary patch delta 590 zcmZuuL2J}d5H{P@;)*8)rKjOh!FAo3mzTV}1O#I;=?1cSA$c+Facct>tCp>Tw}M9x zqU_PLCyxPtjDN$c2VdM$TId{x`DXaOnUDE0`8E04++}n+Uo5A#WxGIG;Ie>;Z?BzG zK86ut)`g)JSbku00{hGM<-0e>hez!Jv>%U`Cl3O^-Ef}f7-Lew;aea{on>&5Zki^6 zgT;Hzxk{HYG9Eol(hQ>#LxuNZAXlBXGL7v`4wQ4xS?w9*$@$tb1VxE2Qdw8iSStXb zVw$x3Yil+OEE>38&o|uek1;VENWi9`Fiw?O$-0ct%(RCL^Bpzohc;+GVV$W&=4uQZ zpY9C1?Trt{U@+*u4+~@K=d)h@5S+peswT~2+0+%5MJWpq4uzsV>#jRChe*zgutbHsnn!z_N1+1GcY29JR;fy5 z4xTu3q%WU<$NjZGjlgqUkOk)JbrpDwK{N}?CXLmsd%AgJKwN(5k%BpwuqSxe-n?(z SrWO!boaiJhr~5n_-uefz?X5S2nhLMVa2urv^1Y*s7DE9+F%yG~VXNoXZI$2f_gp^X#bwzP+m zFKB7-9~64aB^C74@94kumT{66Cu9%9zL}l(-pu~0f31HTu5#9RH5xZK<1TRSGv+(a z`5WiVF~Oi#`%ckn`wpY9cUtTpADtY&Ee@dgcyc<~^g-kA+Rb}CnD1*gn-mU4 z@9^12O)tr_MF*^w?egg^p*iZIs0mx0xZe*VsnN>^ zgo7Z}SPA-Jq@?O00f_nb!g(LuBC!-8J zm&3NohG8V*VXjr0q;UeC%^}Hevo{$_0J=?rRAp)h``8Reogf3@xig9+)?pUL5eUHn zcNJzh;Rc8n`;S1_Er=5p-N@;(Sgcj3Bj#5E9)9-RijYo}UzVPd$IJo>qX`DlcFUhe G_0bjOoQov@ diff --git a/lispusers/TEDIT-PF-SEE b/lispusers/TEDIT-PF-SEE index 414b8a19..6c19e0bc 100644 --- a/lispusers/TEDIT-PF-SEE +++ b/lispusers/TEDIT-PF-SEE @@ -1,10 +1,12 @@ (DEFINE-FILE-INFO PACKAGE "INTERLISP" READTABLE "INTERLISP" BASE 10) -(FILECREATED "23-Dec-2024 19:26:20" {WMEDLEY}TEDIT-PF-SEE.;133 11059 +(FILECREATED "26-Mar-2025 10:09:16" {WMEDLEY}TEDIT-PF-SEE.;137 11103 :EDIT-BY rmk - :PREVIOUS-DATE " 7-Dec-2024 18:00:39" {WMEDLEY}TEDIT-PF-SEE.;132) + :CHANGES-TO (FNS PF-TEDIT) + + :PREVIOUS-DATE "18-Feb-2025 23:39:40" {WMEDLEY}TEDIT-PF-SEE.;136) (PRETTYCOMPRINT TEDIT-PF-SEECOMS) @@ -24,7 +26,9 @@ (DEFINEQ (PF-TEDIT - [LAMBDA (FN IFILES VERSION REPRINT) (* ; "Edited 6-Dec-2024 19:15 by rmk") + [LAMBDA (FN IFILES VERSION REPRINT) (* ; "Edited 26-Mar-2025 10:08 by rmk") + (* ; "Edited 18-Feb-2025 23:39 by rmk") + (* ; "Edited 6-Dec-2024 19:15 by rmk") (* ; "Edited 27-Aug-2024 13:03 by rmk") (* ; "Edited 27-Mar-2024 23:45 by rmk") (* ; "Edited 25-Dec-2023 12:24 by rmk") @@ -75,71 +79,74 @@ (SETQ IFILE (FINDFILEVERSION (CAR (WHEREIS FN NIL T)) IFILE))) UNLESS (MEMB (FILENAMEFIELD IFILE 'EXTENSION) *COMPILED-EXTENSIONS*) - DO (SETQ LOC (FINDFNDEF FN IFILE)) - (IF (LISTP LOC) - THEN (SETQ TFPROP (LIST FN (CAR LOC))) - [SETQ WINDOW (FIND W IN (OPENWINDOWS) - SUCHTHAT (AND (EQUAL TFPROP (WINDOWPROP W 'TF)) - (fetch (TEXTWINDOW WTEXTSTREAM) of W] - (IF (AND WINDOW (NOT REPRINT)) - THEN - (* ;; + DO + (SETQ LOC (FINDFNDEF FN IFILE)) + (IF (LISTP LOC) + THEN (SETQ TFPROP (LIST FN (CAR LOC))) + [SETQ WINDOW (FIND W IN (OPENWINDOWS) + SUCHTHAT (AND (EQUAL TFPROP (WINDOWPROP W 'TF)) + (fetch (TEXTWINDOW WTEXTSTREAM) of W] + (IF (AND WINDOW (NOT REPRINT)) + THEN + (* ;;  "If already an open PF window on this function in this file, just raise it to the top") - (TOTOPW WINDOW) - (RETURN) - ELSE (CL:WITH-OPEN-FILE (ISTREAM (POP LOC) - :DIRECTION :INPUT) - (SETQ ENV (LISPSOURCEFILEP ISTREAM)) - (SETFILEINFO ISTREAM 'FORMAT ENV) - (SETQ TSTREAM (OPENTEXTSTREAM)) - (DSPFONT DEFAULTFONT TSTREAM) - (PRINTOUT TSTREAM 5 "[From " (FULLNAME ISTREAM) - "]" T) - (PRINT-READER-ENVIRONMENT ENV TSTREAM) - (IF REPRINT - THEN (SETFILEPTR ISTREAM (POP LOC)) - (SETQ EXPR (WITH-READER-ENVIRONMENT ENV (READ ISTREAM)) - ) - (WITH-READER-ENVIRONMENT ENV - (IF (EQ FN (CAR EXPR)) - THEN (DSPFONT BOLDFONT TSTREAM) - (PRINT FN TSTREAM) - (DSPFONT DEFAULTFONT TSTREAM) - (SETQ EXPR (CADR EXPR)) - (PRINTDEF EXPR 3 T NIL NIL TSTREAM) - ELSEIF (EQ FN (CADR EXPR)) - THEN - (* ;; + (TOTOPW WINDOW) + (RETURN) + ELSE (CL:WITH-OPEN-FILE + (ISTREAM (POP LOC) + :DIRECTION :INPUT) + (SETQ ENV (LISPSOURCEFILEP ISTREAM)) + (SETFILEINFO ISTREAM 'FORMAT ENV) + [SETQ TSTREAM (OPENTEXTSTREAM + NIL NIL `(PARABREAKCHARS NIL OPENWIDTH + ,(TIMES TEDIT.SOURCE.LINELENGTH + (CHARWIDTH (CHARCODE SPACE) + DEFAULTFONT] + (DSPFONT DEFAULTFONT TSTREAM) + (PRINTOUT TSTREAM 5 "[From " (FULLNAME ISTREAM) + "]" T) + (PRINT-READER-ENVIRONMENT ENV TSTREAM) + (IF REPRINT + THEN (SETFILEPTR ISTREAM (POP LOC)) + (SETQ EXPR (WITH-READER-ENVIRONMENT ENV (READ ISTREAM))) + (WITH-READER-ENVIRONMENT ENV + (IF (EQ FN (CAR EXPR)) + THEN (DSPFONT BOLDFONT TSTREAM) + (PRINT FN TSTREAM) + (DSPFONT DEFAULTFONT TSTREAM) + (SETQ EXPR (CADR EXPR)) + (PRINTDEF EXPR 3 T NIL NIL TSTREAM) + ELSEIF (EQ FN (CADR EXPR)) + THEN + (* ;;  "Presumably a DEFUN. Print the CAR, boldface the cadr") - (PRINTOUT TSTREAM "(" .P2 (CAR EXPR) - " " .FONT BOLDFONT .P2 (CADR EXPR) - .FONT DEFAULTFONT " " .P2 - (CADDR EXPR) - T 3) - (PRINTDEF (CDDDR EXPR) - 3 T T NIL TSTREAM) - (PRIN3 ")" TSTREAM) - ELSE (PRINTDEF EXPR 3 NIL NIL NIL TSTREAM))) - ELSE (PFI.MAYBE.PP.DEFINITION ISTREAM TSTREAM (POP LOC) - (POP LOC))) - (TERPRI TSTREAM) - [TEDIT TSTREAM (OR WINDOW 'TF) - NIL - `(READONLY T LEAVETTY T TITLE ,(CONCAT FN " from " - (FULLNAME ISTREAM] - (TEXTPROP TSTREAM 'ITEM-NAME FN) - (TEXTPROP TSTREAM 'BOUNDTABLE (TEDIT.ATOMBOUND.READTABLE - *READTABLE*)) + (PRINTOUT TSTREAM "(" .P2 (CAR EXPR) + " " .FONT BOLDFONT .P2 (CADR EXPR) + .FONT DEFAULTFONT " " .P2 (CADDR EXPR) + T 3) + (PRINTDEF (CDDDR EXPR) + 3 T T NIL TSTREAM) + (PRIN3 ")" TSTREAM) + ELSE (PRINTDEF EXPR 3 NIL NIL NIL TSTREAM))) + ELSE (PFI.MAYBE.PP.DEFINITION ISTREAM TSTREAM (POP LOC) + (POP LOC))) + (TERPRI TSTREAM) + [TEDIT TSTREAM (OR WINDOW 'TF) + NIL + `(READONLY T LEAVETTY T TITLE ,(CONCAT FN " from " (FULLNAME + ISTREAM)) + ITEM-NAME + ,FN BOUNDTABLE ,(TEDIT.ATOMBOUND.READTABLE *READTABLE*] - (* ;; "The windowprop allows for reprinting as a window action, or reprinting from a command that can find and reuse the previous (presumably unprettied) window.") + (* ;; "The windowprop allows for reprinting as a window action, or reprinting from a command that can find and reuse the previous (presumably unprettied) window.") - (WINDOWPROP (WFROMDS TSTREAM) - 'TF TFPROP))) - ELSEIF (EQ LOC 'FILE.NOT.FOUND) - THEN (printout T "file " IFILE " not found." T) - ELSE (printout T FN " not found on " LOC "." T))) + (WINDOWPROP (WFROMDS TSTREAM) + 'TF TFPROP))) + ELSEIF (EQ LOC 'FILE.NOT.FOUND) + THEN (printout T "file " IFILE " not found." T) + ELSE (printout T FN " not found on " LOC "." T))) (SETQ *LAST-DF* FN) ELSE (PRINTOUT T FN " has no function definition" T]) @@ -198,5 +205,5 @@ (ADDTOVAR LAMA ) ) (DECLARE%: DONTCOPY - (FILEMAP (NIL (973 10035 (PF-TEDIT 983 . 8821) (PF-TEDIT-FROM-TEXT 8823 . 10033))))) + (FILEMAP (NIL (1007 10079 (PF-TEDIT 1017 . 8865) (PF-TEDIT-FROM-TEXT 8867 . 10077))))) STOP diff --git a/lispusers/TEDIT-PF-SEE.LCOM b/lispusers/TEDIT-PF-SEE.LCOM index 0cd1311430ebb96b8f038f19d6b8d22d3f4a8bac..94a0d8d0caa63b51df39c5f035207a96e9106331 100644 GIT binary patch delta 1285 zcmZux-Hy{n6ehcn(m(;J(W=TKbYuZaR&wN-@lWhKCms_E|J5GHtkg<{-L#8fyD04i z5)!%Nii;vYL0oe}gjdd?^<42>E*S}hMwj-Ne#x;%vC^JlBy?s$-gy5K=1;PJ1Z zg;gBG`PlJztij>K-!b6-l2W3Ldc!b^`K;hR<^ipLKK!h%7k4WM2q6XoPonA5eOMho zfu1*;`{_Mi>LP<-n3iYtjKIqazKF7_)B{Wn8ky+f@=;5eGLN~QX}o!HcgyZIe|6rk z10MQSEW#`m5F!?Ysgx9^Ssa{d87Q*jGOLOiAIDM3W1ijVUZ=l^%5**x19uw8jXKxcWoI2W?4G(1(>c4a+6X&;b2;_=LNPA zOw-2kM&rcapYm~@k8xyC8i^=N!6YuIR-+C~1HrNH44BKlsF{PH{uG!k!Bt9TwPAD( z%$z7!0t}05*Gi3@QAZglFdW=@gK-)`v0@2GflgXy0u(zCl(|YlW#wuSD09xV#5Hh1 z`~VllxdtT{@*(7+0K%GecXvtfWqz)c;F`z;1fOb~N}h}_ZF1>n`@~Qj9pelJDP}oO z1%Dt)fp`fZQ>0PUQ6T2chwhyUS-z(Oj< delta 1184 zcmZuw%Wl&^6pdRTAv{#Ip+bPrmBpj2l*%*XM{EfpCmz#Cj_o>=8U!pL4NX+~P+`G} z>{zh?`3sO(g9KuS6!;2$gHPa&-9QkGCC`1&nRD;FT6?$p=I#=!dxL(RYE%beJJfWj z@pji7vsI|7l+HM*Lz%;D6&@cA`UiW5qo;#y7`!+)L< z>+9<(Y(ILA@&Bu-8|rFx#cv0^m2g*Z4^+DNFRbi?a?@czh-TQ}aIY=u&3kaPw+mG# zPWVUHZL=7S2>4DN=bX^1=fsN7I!_CxtP_CxTo4tU&mdx7wyP)GxXW)yf+jlmkC z@r2t9_?mREfBvdE6%zsr9RqbUC{}zoA^o-p`9Gwe2nC=clzvda+lP{z+P!3d>pTM64`lgA*^u zSHG0=V#EADn)#=-1DSVx>=`K!FXij3lqbCcL@oDBwM#k1V^b~{QIMN*!?3STuANdA zN-Ku0S@58<6|}no3}!&w69pAH1qNl1`bpIBx?o6V_+3#r2+3ZbynIWytv^P+!BD|Y zf^HFLMPbWD(KJDhQ0R6z=vYti1bGLYnAz>x#WApk4S6H5f50q+fL&q0Og3ZI@ocvV zj7bc6KBGk%1x6ZqBmt(G(AsdrJ3MbYMR2kh1=_Iwa#+(0nj*a87^8?LIP3;^-MFZM zx6aW4MW&`!Vrn=(u7^`*L6-|T?XgIJXnGM{&%T$Jgl$aGHl_z!ML7bN_J`X+7QkYcosGu{h}sRrHFpe=Z(UQlgN5N#14=}2C{ z-7PM}JyZ(hQ5c}YbXkX3H2YSr%@LMO$`@LAV?RnduE1vuI=)U7;K|X!9`4LUZ54NX kT`GRmI^GQe>WT^tR3EBfWLAaF*(}?wY~c3!OJ(!yFH&R-`2YX_