Skip to content

Make sure TEDIT backing files close on error #2284

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Sep 10, 2025
Merged

Make sure TEDIT backing files close on error #2284

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
55 changes: 28 additions & 27 deletions library/tedit/TEDIT
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
(DEFINE-FILE-INFO PACKAGE "INTERLISP" READTABLE "INTERLISP" BASE 10)

(FILECREATED " 6-Sep-2025 09:54:48" {WMEDLEY}<library>TEDIT>TEDIT.;837 145260
(FILECREATED " 8-Sep-2025 22:10:20" {WMEDLEY}<library>TEDIT>TEDIT.;838 145349

:EDIT-BY rmk

:CHANGES-TO (FNS \TEDIT.REPLACE.SELPIECES TEDIT.INSERT.OBJECT)
:CHANGES-TO (FNS TEDIT.NTHCHARCODE)

:PREVIOUS-DATE " 1-Aug-2025 14:50:15" {WMEDLEY}<library>TEDIT>TEDIT.;835)
:PREVIOUS-DATE " 6-Sep-2025 09:54:48" {WMEDLEY}<library>TEDIT>TEDIT.;837)


(PRETTYCOMPRINT TEDITCOMS)
Expand Down Expand Up @@ -1162,7 +1162,8 @@
(\TEDIT.RPLCHARCODE TSTREAM N NEWCHARCODE NEWCHARLOOKS DONTDISPLAY])

(TEDIT.NTHCHARCODE
[LAMBDA (TSTREAM N) (* ; "Edited 28-Mar-2025 14:10 by rmk")
[LAMBDA (TSTREAM N) (* ; "Edited 8-Sep-2025 22:09 by rmk")
(* ; "Edited 28-Mar-2025 14:10 by rmk")
(* ; "Edited 7-Jul-2024 11:09 by rmk")
(* ; "Edited 29-Apr-2024 13:06 by rmk")
(* ; "Edited 17-Mar-2024 00:27 by rmk")
Expand All @@ -1185,7 +1186,7 @@
(* ;; "Out of the selection: force NIL")

(SETQ N 0)))
(SETQ TSTREAM (TSTREAM TSTREAM))
(SETQ TSTREAM (TEXTSTREAM TSTREAM))
else (SETQ TSTREAM (TEXTSTREAM TSTREAM))
(CL:WHEN (ILESSP N 0)
(SETQ N (IPLUS (TEDIT.NCHARS TSTREAM)
Expand Down Expand Up @@ -2325,26 +2326,26 @@
(ADDTOVAR PRINTFILETYPES (TEDIT (TEST \TEDIT.GET.TRAILER)
(EXTENSION (TEDIT))))
(DECLARE%: DONTCOPY
(FILEMAP (NIL (4850 7244 (MAKE-TEDIT-EXPORTS.ALL 4860 . 5406) (UPDATE-TEDIT 5408 . 6337) (EDIT-TEDIT
6339 . 7242)) (8674 36732 (TEDIT 8684 . 11298) (TEXTSTREAM 11300 . 13189) (TEXTSTREAMP 13191 . 13575)
(COERCETEXTSTREAM 13577 . 17788) (TEDIT.CONCAT 17790 . 21092) (TEDITSTRING 21094 . 22008) (TEDIT-SEE
22010 . 22569) (TEDIT.COPY 22571 . 24716) (TEDIT.DELETE 24718 . 26079) (TEDIT.INSERT 26081 . 29455) (
TEDIT.TERPRI 29457 . 30571) (TEDIT.KILL 30573 . 31555) (TEDIT.QUIT 31557 . 32923) (TEDIT.MOVE 32925 .
33813) (TEDIT.STRINGWIDTH 33815 . 34486) (TEDIT.CHARWIDTH 34488 . 36730)) (36733 38674 (TEXTOBJ 36743
. 37208) (COERCETEXTOBJ 37210 . 38672)) (40074 41724 (TDRIBBLE 40084 . 41722)) (41765 53661 (
TEDIT.INSERT.OBJECT 41775 . 45482) (TEDIT.EDIT.OBJECT 45484 . 48424) (TEDIT.OBJECT.CHANGED 48426 .
51616) (TEDIT.MAP.OBJECTS 51618 . 53189) (\TEDIT.FIRST.OBJPIECE 53191 . 53424) (\TEDIT.NEXT.OBJPIECE
53426 . 53659)) (53684 61127 (\TEDIT.CONCAT.PAGEFRAMES 53694 . 58761) (\TEDIT.GET.PAGE.HEADINGS 58763
. 59792) (\TEDIT.CONCAT.INSTALL.HEADINGS 59794 . 61125)) (61128 64735 (\TEDIT.MOVE.MSG 61138 . 63219)
(\TEDIT.READONLY 63221 . 64733)) (64736 70511 (TEDIT.NCHARS 64746 . 65119) (TEDIT.RPLCHARCODE 65121
. 68111) (TEDIT.NTHCHARCODE 68113 . 70040) (TEDIT.NTHCHAR 70042 . 70509)) (70557 127586 (\TEDIT1
70567 . 72644) (\TEDIT.INSERT 72646 . 79011) (\TEDIT.MOVE 79013 . 86919) (\TEDIT.COPY 86921 . 91452) (
\TEDIT.REPLACE.SELPIECES 91454 . 95990) (\TEDIT.INSERT.SELPIECES 95992 . 98989) (\TEDIT.RESTARTFN
98991 . 101496) (\TEDIT.CHARDELETE 101498 . 104427) (\TEDIT.COPYPIECE 104429 . 109591) (
\TEDIT.APPLY.OBJFN 109593 . 112679) (\TEDIT.DELETE 112681 . 117049) (\TEDIT.DIFFUSE.PARALOOKS 117051
. 119322) (\TEDIT.WORDDELETE 119324 . 120939) (\TEDIT.WORDDELETE.FORWARD 120941 . 122730) (
\TEDIT.FINISHEDIT? 122732 . 127584)) (127587 128246 (\TEDIT.THELP 127597 . 128244)) (128280 137411 (
\TEDIT.PARAPIECES 128290 . 130264) (\TEDIT.PARACHNOS 130266 . 131158) (\TEDIT.PARA.FIRST 131160 .
134261) (\TEDIT.PARA.LAST 134263 . 137409)) (137412 144507 (\TEDIT.WORD.FIRST 137422 . 141426) (
\TEDIT.WORD.LAST 141428 . 144505)) (144708 144985 (TEDITSYSTEMDATE 144718 . 144983)))))
(FILEMAP (NIL (4823 7217 (MAKE-TEDIT-EXPORTS.ALL 4833 . 5379) (UPDATE-TEDIT 5381 . 6310) (EDIT-TEDIT
6312 . 7215)) (8647 36705 (TEDIT 8657 . 11271) (TEXTSTREAM 11273 . 13162) (TEXTSTREAMP 13164 . 13548)
(COERCETEXTSTREAM 13550 . 17761) (TEDIT.CONCAT 17763 . 21065) (TEDITSTRING 21067 . 21981) (TEDIT-SEE
21983 . 22542) (TEDIT.COPY 22544 . 24689) (TEDIT.DELETE 24691 . 26052) (TEDIT.INSERT 26054 . 29428) (
TEDIT.TERPRI 29430 . 30544) (TEDIT.KILL 30546 . 31528) (TEDIT.QUIT 31530 . 32896) (TEDIT.MOVE 32898 .
33786) (TEDIT.STRINGWIDTH 33788 . 34459) (TEDIT.CHARWIDTH 34461 . 36703)) (36706 38647 (TEXTOBJ 36716
. 37181) (COERCETEXTOBJ 37183 . 38645)) (40047 41697 (TDRIBBLE 40057 . 41695)) (41738 53634 (
TEDIT.INSERT.OBJECT 41748 . 45455) (TEDIT.EDIT.OBJECT 45457 . 48397) (TEDIT.OBJECT.CHANGED 48399 .
51589) (TEDIT.MAP.OBJECTS 51591 . 53162) (\TEDIT.FIRST.OBJPIECE 53164 . 53397) (\TEDIT.NEXT.OBJPIECE
53399 . 53632)) (53657 61100 (\TEDIT.CONCAT.PAGEFRAMES 53667 . 58734) (\TEDIT.GET.PAGE.HEADINGS 58736
. 59765) (\TEDIT.CONCAT.INSTALL.HEADINGS 59767 . 61098)) (61101 64708 (\TEDIT.MOVE.MSG 61111 . 63192)
(\TEDIT.READONLY 63194 . 64706)) (64709 70600 (TEDIT.NCHARS 64719 . 65092) (TEDIT.RPLCHARCODE 65094
. 68084) (TEDIT.NTHCHARCODE 68086 . 70129) (TEDIT.NTHCHAR 70131 . 70598)) (70646 127675 (\TEDIT1
70656 . 72733) (\TEDIT.INSERT 72735 . 79100) (\TEDIT.MOVE 79102 . 87008) (\TEDIT.COPY 87010 . 91541) (
\TEDIT.REPLACE.SELPIECES 91543 . 96079) (\TEDIT.INSERT.SELPIECES 96081 . 99078) (\TEDIT.RESTARTFN
99080 . 101585) (\TEDIT.CHARDELETE 101587 . 104516) (\TEDIT.COPYPIECE 104518 . 109680) (
\TEDIT.APPLY.OBJFN 109682 . 112768) (\TEDIT.DELETE 112770 . 117138) (\TEDIT.DIFFUSE.PARALOOKS 117140
. 119411) (\TEDIT.WORDDELETE 119413 . 121028) (\TEDIT.WORDDELETE.FORWARD 121030 . 122819) (
\TEDIT.FINISHEDIT? 122821 . 127673)) (127676 128335 (\TEDIT.THELP 127686 . 128333)) (128369 137500 (
\TEDIT.PARAPIECES 128379 . 130353) (\TEDIT.PARACHNOS 130355 . 131247) (\TEDIT.PARA.FIRST 131249 .
134350) (\TEDIT.PARA.LAST 134352 . 137498)) (137501 144596 (\TEDIT.WORD.FIRST 137511 . 141515) (
\TEDIT.WORD.LAST 141517 . 144594)) (144797 145074 (TEDITSYSTEMDATE 144807 . 145072)))))
STOP
46 changes: 22 additions & 24 deletions library/tedit/TEDIT-OLDFILE
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,15 +1,12 @@
(DEFINE-FILE-INFO PACKAGE "INTERLISP" READTABLE "INTERLISP" BASE 10)

(FILECREATED " 1-Aug-2025 14:58:21" 
{DSK}<Users>kaplan>Local>medley3.5>working-medley>library>tedit>TEDIT-OLDFILE.;38 73837
(FILECREATED " 8-Sep-2025 22:10:10" {WMEDLEY}<library>TEDIT>TEDIT-OLDFILE.;40 73888

:EDIT-BY rmk

:CHANGES-TO (FNS \TEDIT.GET.CHARLOOKS2 \TEDIT.GET.PCTB1 \TEDIT.GET.PCTB2
\TEDIT.GET.SINGLE.CHARLOOKS2 \TEDIT.GET.CHARLOOKS0 \TEDIT.GET.CHARLOOKS1)
:CHANGES-TO (FNS \TEDIT.GET.PCTB2)

:PREVIOUS-DATE "28-Jul-2025 23:43:57"
{DSK}<Users>kaplan>Local>medley3.5>working-medley>library>tedit>TEDIT-OLDFILE.;34)
:PREVIOUS-DATE " 7-Sep-2025 11:07:57" {WMEDLEY}<library>TEDIT>TEDIT-OLDFILE.;39)


(PRETTYCOMPRINT TEDIT-OLDFILECOMS)
Expand Down Expand Up @@ -49,7 +46,8 @@
(DEFINEQ

(\TEDIT.GET.PCTB2
[LAMBDA (TEXT TSTREAM PCCOUNT START END) (* ; "Edited 1-Aug-2025 14:55 by rmk")
[LAMBDA (TEXT TSTREAM PCCOUNT START END) (* ; "Edited 8-Sep-2025 22:08 by rmk")
(* ; "Edited 1-Aug-2025 14:55 by rmk")
(* ; "Edited 28-Jul-2025 23:39 by rmk")
(* ; "Edited 8-Feb-2025 20:21 by rmk")
(* ; "Edited 21-Oct-2024 00:33 by rmk")
Expand All @@ -73,7 +71,7 @@

(* ;; "END = use this as eofptr of file. For use in reading files within files.")

(LET ((TEXTOBJ (FTEXTOBJ (TSTREAM)))
(LET ((TEXTOBJ (FTEXTOBJ TSTREAM))
PIECEINFOCH#
(CURFILECH# (OR START 0))
LOOKSHASH PARAHASH)
Expand Down Expand Up @@ -283,7 +281,8 @@
(for I from 1 to (\WIN FILE) collect (\TEDIT.GET.SINGLE.CHARLOOKS2 FILE])

(\TEDIT.GET.SINGLE.CHARLOOKS2
[LAMBDA (FILE) (* ; "Edited 1-Aug-2025 12:13 by rmk")
[LAMBDA (FILE) (* ; "Edited 7-Sep-2025 11:03 by rmk")
(* ; "Edited 1-Aug-2025 12:13 by rmk")
(* ; "Edited 7-Jan-2025 12:29 by rmk")
(* ; "Edited 2-Jan-2025 11:09 by rmk")
(* ; "Edited 31-Jul-2024 00:05 by rmk")
Expand Down Expand Up @@ -327,7 +326,6 @@
(BOLD 'BOLD)
(ITALIC 'ITALIC]
(FSETCLOOKS LOOKS CLFONT FONT)
(FSETCLOOKS LOOKS CLNAME (FONTUNPARSE FONT))
(RETURN LOOKS])

(\TEDIT.PUT.SINGLE.PARALOOKS2
Expand Down Expand Up @@ -730,7 +728,8 @@
(\TEDIT.PARSE.PAGEFRAMES1 (pop PAGELIST])

(\TEDIT.GET.CHARLOOKS1
[LAMBDA (PC FILE) (* ; "Edited 1-Aug-2025 12:18 by rmk")
[LAMBDA (PC FILE) (* ; "Edited 7-Sep-2025 11:03 by rmk")
(* ; "Edited 1-Aug-2025 12:18 by rmk")
(* ; "Edited 28-Jul-2025 23:40 by rmk")
(* ; "Edited 2-Jan-2025 11:09 by rmk")
(* ; "Edited 31-Jul-2024 00:05 by rmk")
Expand Down Expand Up @@ -788,7 +787,6 @@
(ITALIC 'ITALIC]
else (* ; "Should never happen")
(FONTCREATE DEFAULTFONT)))
(FSETCLOOKS LOOKS CLNAME (FONTUNPARSE FONT))
(FSETCLOOKS LOOKS CLFONT FONT])

(\TEDIT.GET.PARALOOKS1
Expand Down Expand Up @@ -956,7 +954,8 @@
(\TEDIT.INSERTPIECE PC NIL TEXTOBJ) finally (\TEDIT.UNIQUIFY.ALL TEXTOBJ])

(\TEDIT.GET.CHARLOOKS0
[LAMBDA (PC FILE) (* ; "Edited 1-Aug-2025 12:17 by rmk")
[LAMBDA (PC FILE) (* ; "Edited 7-Sep-2025 11:03 by rmk")
(* ; "Edited 1-Aug-2025 12:17 by rmk")
(* ; "Edited 28-Jul-2025 23:39 by rmk")
(* ; "Edited 2-Jan-2025 11:09 by rmk")
(* ; "Edited 31-Jul-2024 00:05 by rmk")
Expand Down Expand Up @@ -1015,7 +1014,6 @@
else (* ; "Should never happen")
(FONTCREATE DEFAULTFONT)))
(FSETCLOOKS LOOKS CLFONT FONT)
(FSETCLOOKS LOOKS CLNAME (FONTUNPARSE FONT))
(RETURN LOOKS])

(\TEDIT.GET.OBJECT0
Expand Down Expand Up @@ -1102,14 +1100,14 @@
PARALOOKS])
)
(DECLARE%: DONTCOPY
(FILEMAP (NIL (1867 37890 (\TEDIT.GET.PCTB2 1877 . 12526) (\TEDIT.GET.PARALOOKS2 12528 . 13117) (
\TEDIT.GET.CHARLOOKS2 13119 . 14676) (\TEDIT.PARSE.PAGEFRAMES2 14678 . 17417) (
\TEDIT.GET.CHARLOOKS.LIST2 17419 . 17926) (\TEDIT.GET.SINGLE.CHARLOOKS2 17928 . 21234) (
\TEDIT.PUT.SINGLE.PARALOOKS2 21236 . 25486) (\TEDIT.PUT.SINGLE.CHARLOOKS2 25488 . 29198) (
\TEDIT.GET.PARALOOKS.LIST2 29200 . 29707) (\TEDIT.GET.SINGLE.PARALOOKS2 29709 . 34608) (
\TEDIT.PUT.CHARLOOKS.LIST2 34610 . 36689) (\TEDIT.PUT.PARALOOKS.LIST2 36691 . 37888)) (37967 59193 (
\TEDIT.GET.PCTB1 37977 . 44994) (\TEDIT.GET.PAGEFRAMES1 44996 . 45448) (\TEDIT.PARSE.PAGEFRAMES1 45450
. 48103) (\TEDIT.GET.CHARLOOKS1 48105 . 52416) (\TEDIT.GET.PARALOOKS1 52418 . 57329) (
TEDIT.GET.OBJECT1 57331 . 59191)) (59253 73814 (\TEDIT.GET.PCTB0 59263 . 63344) (\TEDIT.GET.CHARLOOKS0
63346 . 67732) (\TEDIT.GET.OBJECT0 67734 . 69809) (\TEDIT.GET.PARALOOKS0 69811 . 73812)))))
(FILEMAP (NIL (1649 37832 (\TEDIT.GET.PCTB2 1659 . 12415) (\TEDIT.GET.PARALOOKS2 12417 . 13006) (
\TEDIT.GET.CHARLOOKS2 13008 . 14565) (\TEDIT.PARSE.PAGEFRAMES2 14567 . 17306) (
\TEDIT.GET.CHARLOOKS.LIST2 17308 . 17815) (\TEDIT.GET.SINGLE.CHARLOOKS2 17817 . 21176) (
\TEDIT.PUT.SINGLE.PARALOOKS2 21178 . 25428) (\TEDIT.PUT.SINGLE.CHARLOOKS2 25430 . 29140) (
\TEDIT.GET.PARALOOKS.LIST2 29142 . 29649) (\TEDIT.GET.SINGLE.PARALOOKS2 29651 . 34550) (
\TEDIT.PUT.CHARLOOKS.LIST2 34552 . 36631) (\TEDIT.PUT.PARALOOKS.LIST2 36633 . 37830)) (37909 59190 (
\TEDIT.GET.PCTB1 37919 . 44936) (\TEDIT.GET.PAGEFRAMES1 44938 . 45390) (\TEDIT.PARSE.PAGEFRAMES1 45392
. 48045) (\TEDIT.GET.CHARLOOKS1 48047 . 52413) (\TEDIT.GET.PARALOOKS1 52415 . 57326) (
TEDIT.GET.OBJECT1 57328 . 59188)) (59250 73865 (\TEDIT.GET.PCTB0 59260 . 63341) (\TEDIT.GET.CHARLOOKS0
63343 . 67783) (\TEDIT.GET.OBJECT0 67785 . 69860) (\TEDIT.GET.PARALOOKS0 69862 . 73863)))))
STOP
Binary file modified library/tedit/TEDIT-OLDFILE.LCOM
View file
Open in desktop
Binary file not shown.
Loading