From 1d8fa0301d688ad07864a9d1e60c72e141292c46 Mon Sep 17 00:00:00 2001 From: rmkaplan Date: Wed, 29 Sep 2021 22:27:18 -0700 Subject: [PATCH] TEDIT: TEDIT-SEE treats FORMAT better for plain-text files --- library/TEDIT | 58 +++++++++++++++++++++++++-------------------- library/TEDIT.LCOM | Bin 38866 -> 38913 bytes 2 files changed, 32 insertions(+), 26 deletions(-) diff --git a/library/TEDIT b/library/TEDIT index 8381bd7b..d366eba4 100644 --- a/library/TEDIT +++ b/library/TEDIT @@ -1,10 +1,12 @@ (DEFINE-FILE-INFO PACKAGE "INTERLISP" READTABLE "INTERLISP" BASE 10) -(FILECREATED "19-Sep-2021 17:08:56" {DSK}kaplan>Local>medley3.5>git-medley>library>TEDIT.;2 141945 - changes to%: (VARS TEDITCOMS) +(FILECREATED "29-Sep-2021 22:16:28"  +{DSK}kaplan>Local>medley3.5>git-medley>library>TEDIT.;11 142247 - previous date%: "19-Apr-2018 12:22:03" -{DSK}kaplan>Local>medley3.5>git-medley>library>TEDIT.;1) + changes to%: (FNS TEDIT-SEE) + + previous date%: "19-Sep-2021 17:08:56" +{DSK}kaplan>Local>medley3.5>git-medley>library>TEDIT.;5) (* ; " @@ -328,12 +330,14 @@ Copyright (c) 1983-1993, 1995, 1999, 2018, 2021 by Venue & Xerox Corporation. (RETURN PROC]) (TEDIT-SEE - [LAMBDA (FILE WINDOW) (* ; "Edited 19-Sep-2021 09:40 by rmk:") + [LAMBDA (FILE WINDOW FORMAT) (* ; "Edited 29-Sep-2021 22:16 by rmk:") (* ; "Edited 27-Feb-2021 20:07 by rmk:") (* ; "Edited 1-Feb-88 19:00 by bvm:") (* ;; "See FILE in a scrollable READONLY TEDIT window. If FILE is a LISP source file, copy first to a temporary NODIRCORE image file that interpretes the fontchange characters rather than showing black boxes.") + (* ;; "FORMAT for text files defaults to :UTF-8 if present, otherwise *DEFAULT-EXTERNALFORMAT*") + (CL:WITH-OPEN-FILE (STREAM FILE :DIRECTION :INPUT) (LET ((SEESTREAM STREAM) ENV TSTREAM) @@ -346,18 +350,20 @@ Copyright (c) 1983-1993, 1995, 1999, 2018, 2021 by Venue & Xerox Corporation. (* ;; "Lisp source file") - (\EXTERNALFORMAT STREAM ENV) + (SETFILEINFO STREAM 'FORMAT ENV) (SETQ SEESTREAM (OPENTEXTSTREAM)) (COPY.TEXT.TO.IMAGE STREAM SEESTREAM) ELSE (* ;; "Not a Lisp source file and not a Tedit file. If it is not random access, we copy it so we can scroll around.") + (* ;; "Maybe there is a conventional way of finding out the external format of a plain-text stream (an EMACS header?), here we nudge towards :UTF-8 (if it exists).") + + (SETFILEINFO STREAM 'FORMAT (OR FORMAT (FIND-FORMAT :UTF-8) + *DEFAULT-EXTERNALFORMAT*)) (CL:UNLESS (RANDACCESSP STREAM) - [SETQ SEESTREAM (OPENSTREAM '{NODIRCORE} 'BOTH 'NEW - `([TYPE ,(GETFILEINFO STREAM 'TYPE] - (FORMAT ,(\EXTERNALFORMAT STREAM] - (COPYBYTES STREAM SEESTREAM))) + (SETQ SEESTREAM (OPENSTREAM '{NODIRCORE} 'BOTH 'NEW)) + (COPYCHARS STREAM SEESTREAM))) [SETQ TSTREAM (TEXTSTREAM (TEDIT SEESTREAM WINDOW NIL '(READONLY T] (WINDOWPROP (WFROMDS TSTREAM) 'TITLE @@ -2229,7 +2235,7 @@ Copyright (c) 1983-1993, 1995, 1999, 2018, 2021 by Venue & Xerox Corporation. (* ; "TEDIT Support information") -(RPAQQ TEDITSYSTEMDATE "19-Sep-2021 17:08:56") +(RPAQQ TEDITSYSTEMDATE "29-Sep-2021 22:16:28") (RPAQ TEDITSUPPORT "TEditSupport.PA") (DEFINEQ @@ -2255,19 +2261,19 @@ Copyright (c) 1983-1993, 1995, 1999, 2018, 2021 by Venue & Xerox Corporation. (PUTPROPS TEDIT COPYRIGHT ("Venue & Xerox Corporation" 1983 1984 1985 1986 1987 1988 1989 1990 1991 1992 1993 1995 1999 2018 2021)) (DECLARE%: DONTCOPY - (FILEMAP (NIL (4327 117111 (\TEDIT2 4337 . 7088) (COERCETEXTOBJ 7090 . 15866) (TEDIT 15868 . 20837) ( -TEDIT-SEE 20839 . 22787) (TEDIT.CHARWIDTH 22789 . 24813) (TEDIT.COPY 24815 . 33251) (TEDIT.DELETE -33253 . 33943) (TEDIT.DO.BLUEPENDINGDELETE 33945 . 37012) (TEDIT.INSERT 37014 . 42544) (TEDIT.KILL -42546 . 44103) (TEDIT.MAPLINES 44105 . 45504) (TEDIT.MAPPIECES 45506 . 46462) (TEDIT.MOVE 46464 . -56248) (TEDIT.QUIT 56250 . 58250) (TEDIT.STRINGWIDTH 58252 . 58923) (TEDIT.\INSERT 58925 . 60950) ( -TEXTOBJ 60952 . 62077) (TEXTSTREAM 62079 . 63694) (\TEDIT.INCLUDE 63696 . 67596) (\TEDIT.INSERT.PIECES - 67598 . 77513) (\TEDIT.MOVE.PIECEMAPFN 77515 . 79594) (\TEDIT.OBJECT.SHOWSEL 79596 . 83225) ( -\TEDIT.RESTARTFN 83227 . 85222) (\TEDIT.CHARDELETE 85224 . 89186) (\TEDIT.COPY.PIECEMAPFN 89188 . -92413) (\TEDIT.DELETE 92415 . 99933) (\TEDIT.DIFFUSE.PARALOOKS 99935 . 102699) (\TEDIT.FOREIGN.COPY? -102701 . 106428) (\TEDIT.QUIT 106430 . 109576) (\TEDIT.WORDDELETE 109578 . 114411) (\TEDIT1 114413 . -117109)) (117225 117341 (\CREATE.TEDIT.RESTART.MENU 117235 . 117339)) (117440 121129 (PLCHAIN 117450 - . 117724) (PRINTLINE 117726 . 120490) (SEEFILE 120492 . 121127)) (121170 140813 (TEDIT.INSERT.OBJECT -121180 . 130257) (TEDIT.EDIT.OBJECT 130259 . 132515) (TEDIT.FIND.OBJECT 132517 . 133410) ( -TEDIT.FIND.OBJECT.SUBTREE 133412 . 134218) (TEDIT.PUT.OBJECT 134220 . 135879) (TEDIT.GET.OBJECT 135881 - . 139080) (TEDIT.OBJECT.CHANGED 139082 . 140811)) (141091 141454 (MAKETEDITFORM 141101 . 141452))))) + (FILEMAP (NIL (4329 117413 (\TEDIT2 4339 . 7090) (COERCETEXTOBJ 7092 . 15868) (TEDIT 15870 . 20839) ( +TEDIT-SEE 20841 . 23089) (TEDIT.CHARWIDTH 23091 . 25115) (TEDIT.COPY 25117 . 33553) (TEDIT.DELETE +33555 . 34245) (TEDIT.DO.BLUEPENDINGDELETE 34247 . 37314) (TEDIT.INSERT 37316 . 42846) (TEDIT.KILL +42848 . 44405) (TEDIT.MAPLINES 44407 . 45806) (TEDIT.MAPPIECES 45808 . 46764) (TEDIT.MOVE 46766 . +56550) (TEDIT.QUIT 56552 . 58552) (TEDIT.STRINGWIDTH 58554 . 59225) (TEDIT.\INSERT 59227 . 61252) ( +TEXTOBJ 61254 . 62379) (TEXTSTREAM 62381 . 63996) (\TEDIT.INCLUDE 63998 . 67898) (\TEDIT.INSERT.PIECES + 67900 . 77815) (\TEDIT.MOVE.PIECEMAPFN 77817 . 79896) (\TEDIT.OBJECT.SHOWSEL 79898 . 83527) ( +\TEDIT.RESTARTFN 83529 . 85524) (\TEDIT.CHARDELETE 85526 . 89488) (\TEDIT.COPY.PIECEMAPFN 89490 . +92715) (\TEDIT.DELETE 92717 . 100235) (\TEDIT.DIFFUSE.PARALOOKS 100237 . 103001) (\TEDIT.FOREIGN.COPY? + 103003 . 106730) (\TEDIT.QUIT 106732 . 109878) (\TEDIT.WORDDELETE 109880 . 114713) (\TEDIT1 114715 . +117411)) (117527 117643 (\CREATE.TEDIT.RESTART.MENU 117537 . 117641)) (117742 121431 (PLCHAIN 117752 + . 118026) (PRINTLINE 118028 . 120792) (SEEFILE 120794 . 121429)) (121472 141115 (TEDIT.INSERT.OBJECT +121482 . 130559) (TEDIT.EDIT.OBJECT 130561 . 132817) (TEDIT.FIND.OBJECT 132819 . 133712) ( +TEDIT.FIND.OBJECT.SUBTREE 133714 . 134520) (TEDIT.PUT.OBJECT 134522 . 136181) (TEDIT.GET.OBJECT 136183 + . 139382) (TEDIT.OBJECT.CHANGED 139384 . 141113)) (141393 141756 (MAKETEDITFORM 141403 . 141754))))) STOP diff --git a/library/TEDIT.LCOM b/library/TEDIT.LCOM index 15e0271ee956f6f254ef2084fd52fde60a88c548..419aa50db9ed8b1e62c8ae265f02f9baac9f840f 100644 GIT binary patch delta 800 zcma)4U279T6wN01U;x#!+{{yG2lOa6W9R&mV_LguE- z5zIq{S}N}ysI*QAD7A@hQ*-z%Ss|nmfawBLmQsg^3)jqE?a-2TD?;JkN8Ib&5E9QI!94W1uiXZyG(@d}yCm>725 zw3~Vb#Vl6tDb3Nf{JX_Rew?-)0Uu2`QW%kzj+)1OrxOa5Z3>n~PB>-NBxs-;L|)vj zBKN&;DW~won|XdYC)a3qdTxEa!TaNfU?Katw8Yk@H*t1#@;c$36*d;elpizK)d_U5 zO~7xwRh*Do-78srIXE@&u)PrmT!0ud(M}jfPMd+~8j_Bf=9Q#z0@AeL#*r(9k)}4s zY?$c!Y25ZWNQ27SZ3-@Af7>9`n3fWRQ0bg(xh*G^w7P~kVUeUY#ypcEbt2DkUB-C= zqY2K$cua!GkD(jzWqH(DRW&`kTPm%ZlL&L4$*fgc5UrC7L9{WCJO(|Z z68CCZubN;rKXh6YG;LmWfq-iMRhXE7)5e^25|?^@`tj!7z5&7)0R>Be%l4)Tq8C#z zNp4Y%h;{)b*kGa!IRC4NHT}e834M*bgpw#Ab4uZ4|8RG70?$VikWm0VEm!m+zHa)o g(z=coVo)I0C;eQxEfr=zDxaq1f35fI^urtJH>(D|!vFvP