Skip to content

Commit b3219c3

Browse files
authored
Merge pull request #521 from Interlisp/Improve-TEDIT-interaction-with-MODERNIZE
Improve tedit interaction with modernize
2 parents b0f9f2c + 1ad92b3 commit b3219c3

File tree

8 files changed

+289
-258
lines changed

8 files changed

+289
-258
lines changed

library/TEDIT

Lines changed: 27 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
(DEFINE-FILE-INFO PACKAGE "INTERLISP" READTABLE "INTERLISP" BASE 10)
22

3-
(FILECREATED "29-Sep-2021 22:16:28" 
4-
{DSK}<Users>kaplan>Local>medley3.5>git-medley>library>TEDIT.;11 142247
3+
(FILECREATED "13-Oct-2021 10:00:40" 
4+
{DSK}<Users>kaplan>Local>medley3.5>git-medley>library>TEDIT.;19 142287
55

66
changes to%: (FNS TEDIT-SEE)
77

8-
previous date%: "19-Sep-2021 17:08:56"
9-
{DSK}<Users>kaplan>Local>medley3.5>git-medley>library>TEDIT.;5)
8+
previous date%: "11-Oct-2021 14:03:12"
9+
{DSK}<Users>kaplan>Local>medley3.5>git-medley>library>TEDIT.;18)
1010

1111

1212
(* ; "
@@ -330,7 +330,7 @@ Copyright (c) 1983-1993, 1995, 1999, 2018, 2021 by Venue & Xerox Corporation.
330330
(RETURN PROC])
331331

332332
(TEDIT-SEE
333-
[LAMBDA (FILE WINDOW FORMAT) (* ; "Edited 29-Sep-2021 22:16 by rmk:")
333+
[LAMBDA (FILE WINDOW FORMAT) (* ; "Edited 13-Oct-2021 10:00 by rmk:")
334334
(* ; "Edited 27-Feb-2021 20:07 by rmk:")
335335
(* ; "Edited 1-Feb-88 19:00 by bvm:")
336336

@@ -340,18 +340,18 @@ Copyright (c) 1983-1993, 1995, 1999, 2018, 2021 by Venue & Xerox Corporation.
340340

341341
(CL:WITH-OPEN-FILE (STREAM FILE :DIRECTION :INPUT)
342342
(LET ((SEESTREAM STREAM)
343-
ENV TSTREAM)
343+
TSTREAM)
344344

345345
(* ;; "No need to fiddle with a TEDIT file")
346346

347347
(IF (\TEDIT.FORMATTEDP1 STREAM)
348-
ELSEIF (SETQ ENV (LISPSOURCEFILEP STREAM))
348+
ELSEIF (LISPSOURCEFILEP STREAM)
349349
THEN
350350

351351
(* ;; "Lisp source file")
352352

353-
(SETFILEINFO STREAM 'FORMAT ENV)
354353
(SETQ SEESTREAM (OPENTEXTSTREAM))
354+
(DSPFONT DEFAULTFONT SEESTREAM)
355355
(COPY.TEXT.TO.IMAGE STREAM SEESTREAM)
356356
ELSE
357357

@@ -360,11 +360,12 @@ Copyright (c) 1983-1993, 1995, 1999, 2018, 2021 by Venue & Xerox Corporation.
360360
(* ;; "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).")
361361

362362
(SETFILEINFO STREAM 'FORMAT (OR FORMAT (FIND-FORMAT :UTF-8)
363-
*DEFAULT-EXTERNALFORMAT*))
363+
:DEFAULT))
364364
(CL:UNLESS (RANDACCESSP STREAM)
365365
(SETQ SEESTREAM (OPENSTREAM '{NODIRCORE} 'BOTH 'NEW))
366366
(COPYCHARS STREAM SEESTREAM)))
367-
[SETQ TSTREAM (TEXTSTREAM (TEDIT SEESTREAM WINDOW NIL '(READONLY T]
367+
[SETQ TSTREAM (TEXTSTREAM (TEDIT SEESTREAM WINDOW NIL
368+
`(READONLY T FONT ,DEFAULTFONT]
368369
(WINDOWPROP (WFROMDS TSTREAM)
369370
'TITLE
370371
(CONCAT "SEE window for " (FULLNAME STREAM)))
@@ -2235,7 +2236,7 @@ Copyright (c) 1983-1993, 1995, 1999, 2018, 2021 by Venue & Xerox Corporation.
22352236
(* ; "TEDIT Support information")
22362237

22372238

2238-
(RPAQQ TEDITSYSTEMDATE "29-Sep-2021 22:16:28")
2239+
(RPAQQ TEDITSYSTEMDATE "13-Oct-2021 10:00:40")
22392240

22402241
(RPAQ TEDITSUPPORT "TEditSupport.PA")
22412242
(DEFINEQ
@@ -2261,19 +2262,19 @@ Copyright (c) 1983-1993, 1995, 1999, 2018, 2021 by Venue & Xerox Corporation.
22612262
(PUTPROPS TEDIT COPYRIGHT ("Venue & Xerox Corporation" 1983 1984 1985 1986 1987 1988 1989 1990 1991
22622263
1992 1993 1995 1999 2018 2021))
22632264
(DECLARE%: DONTCOPY
2264-
(FILEMAP (NIL (4329 117413 (\TEDIT2 4339 . 7090) (COERCETEXTOBJ 7092 . 15868) (TEDIT 15870 . 20839) (
2265-
TEDIT-SEE 20841 . 23089) (TEDIT.CHARWIDTH 23091 . 25115) (TEDIT.COPY 25117 . 33553) (TEDIT.DELETE
2266-
33555 . 34245) (TEDIT.DO.BLUEPENDINGDELETE 34247 . 37314) (TEDIT.INSERT 37316 . 42846) (TEDIT.KILL
2267-
42848 . 44405) (TEDIT.MAPLINES 44407 . 45806) (TEDIT.MAPPIECES 45808 . 46764) (TEDIT.MOVE 46766 .
2268-
56550) (TEDIT.QUIT 56552 . 58552) (TEDIT.STRINGWIDTH 58554 . 59225) (TEDIT.\INSERT 59227 . 61252) (
2269-
TEXTOBJ 61254 . 62379) (TEXTSTREAM 62381 . 63996) (\TEDIT.INCLUDE 63998 . 67898) (\TEDIT.INSERT.PIECES
2270-
67900 . 77815) (\TEDIT.MOVE.PIECEMAPFN 77817 . 79896) (\TEDIT.OBJECT.SHOWSEL 79898 . 83527) (
2271-
\TEDIT.RESTARTFN 83529 . 85524) (\TEDIT.CHARDELETE 85526 . 89488) (\TEDIT.COPY.PIECEMAPFN 89490 .
2272-
92715) (\TEDIT.DELETE 92717 . 100235) (\TEDIT.DIFFUSE.PARALOOKS 100237 . 103001) (\TEDIT.FOREIGN.COPY?
2273-
103003 . 106730) (\TEDIT.QUIT 106732 . 109878) (\TEDIT.WORDDELETE 109880 . 114713) (\TEDIT1 114715 .
2274-
117411)) (117527 117643 (\CREATE.TEDIT.RESTART.MENU 117537 . 117641)) (117742 121431 (PLCHAIN 117752
2275-
. 118026) (PRINTLINE 118028 . 120792) (SEEFILE 120794 . 121429)) (121472 141115 (TEDIT.INSERT.OBJECT
2276-
121482 . 130559) (TEDIT.EDIT.OBJECT 130561 . 132817) (TEDIT.FIND.OBJECT 132819 . 133712) (
2277-
TEDIT.FIND.OBJECT.SUBTREE 133714 . 134520) (TEDIT.PUT.OBJECT 134522 . 136181) (TEDIT.GET.OBJECT 136183
2278-
. 139382) (TEDIT.OBJECT.CHANGED 139384 . 141113)) (141393 141756 (MAKETEDITFORM 141403 . 141754)))))
2265+
(FILEMAP (NIL (4330 117453 (\TEDIT2 4340 . 7091) (COERCETEXTOBJ 7093 . 15869) (TEDIT 15871 . 20840) (
2266+
TEDIT-SEE 20842 . 23129) (TEDIT.CHARWIDTH 23131 . 25155) (TEDIT.COPY 25157 . 33593) (TEDIT.DELETE
2267+
33595 . 34285) (TEDIT.DO.BLUEPENDINGDELETE 34287 . 37354) (TEDIT.INSERT 37356 . 42886) (TEDIT.KILL
2268+
42888 . 44445) (TEDIT.MAPLINES 44447 . 45846) (TEDIT.MAPPIECES 45848 . 46804) (TEDIT.MOVE 46806 .
2269+
56590) (TEDIT.QUIT 56592 . 58592) (TEDIT.STRINGWIDTH 58594 . 59265) (TEDIT.\INSERT 59267 . 61292) (
2270+
TEXTOBJ 61294 . 62419) (TEXTSTREAM 62421 . 64036) (\TEDIT.INCLUDE 64038 . 67938) (\TEDIT.INSERT.PIECES
2271+
67940 . 77855) (\TEDIT.MOVE.PIECEMAPFN 77857 . 79936) (\TEDIT.OBJECT.SHOWSEL 79938 . 83567) (
2272+
\TEDIT.RESTARTFN 83569 . 85564) (\TEDIT.CHARDELETE 85566 . 89528) (\TEDIT.COPY.PIECEMAPFN 89530 .
2273+
92755) (\TEDIT.DELETE 92757 . 100275) (\TEDIT.DIFFUSE.PARALOOKS 100277 . 103041) (\TEDIT.FOREIGN.COPY?
2274+
103043 . 106770) (\TEDIT.QUIT 106772 . 109918) (\TEDIT.WORDDELETE 109920 . 114753) (\TEDIT1 114755 .
2275+
117451)) (117567 117683 (\CREATE.TEDIT.RESTART.MENU 117577 . 117681)) (117782 121471 (PLCHAIN 117792
2276+
. 118066) (PRINTLINE 118068 . 120832) (SEEFILE 120834 . 121469)) (121512 141155 (TEDIT.INSERT.OBJECT
2277+
121522 . 130599) (TEDIT.EDIT.OBJECT 130601 . 132857) (TEDIT.FIND.OBJECT 132859 . 133752) (
2278+
TEDIT.FIND.OBJECT.SUBTREE 133754 . 134560) (TEDIT.PUT.OBJECT 134562 . 136221) (TEDIT.GET.OBJECT 136223
2279+
. 139422) (TEDIT.OBJECT.CHANGED 139424 . 141153)) (141433 141796 (MAKETEDITFORM 141443 . 141794)))))
22792280
STOP

library/TEDIT.LCOM

-8 Bytes
Binary file not shown.

0 commit comments

Comments
 (0)