Skip to content

Commit f4fd00f

Browse files
rmkaplanrmkaplan
committed
Systematically renamed internal Tedit files with \TEDIT
This includes some files in lispusers that are not in the Tedit core but had references to Tedit internal functions (TMAX, DOC-OBJECTS and some others) that have been renamed. (I hope to clean out those internal references, at some point.) A few additional changes are here to track the changes that were recently made in the unrenamed master branch. Going forward, I want to make future changes in this branch. Eventual plan is to introduce a Tedit package and do another systematic renaming of all \TEDIT.xxx functions to TEDIT::xxx, this is a first step. This does not yet include a backward-compatibility mapping of oldnames to newnames, as was discussed in the technical meeting.
1 parent f6eb5d9 commit f4fd00f

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

58 files changed

+4031
-3569
lines changed

‎library/TEXEC

+77-104
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,14 @@
11
(DEFINE-FILE-INFO PACKAGE "INTERLISP" READTABLE "XCL" BASE 10)
22

3-
(FILECREATED "18-Jun-2023 09:48:54" |{WMEDLEY}<library>TEXEC.;5| 185935
3+
(FILECREATED "28-Mar-2024 00:09:16" |{WMEDLEY}<library>TEXEC.;6| 185248
44

55
:EDIT-BY |rmk|
66

7-
:CHANGES-TO (VARS TEXECCOMS)
7+
:CHANGES-TO (FNS TEXEC.DEFAULT.MENUFN TEXEC.SHRINK.ICONCREATE)
88

9-
:PREVIOUS-DATE "16-Jul-2022 23:42:20" |{WMEDLEY}<library>TEXEC.;3|)
9+
:PREVIOUS-DATE "18-Jun-2023 09:48:54" |{WMEDLEY}<library>TEXEC.;5|)
1010

1111

12-
; Copyright (c) 1985, 1900, 1986-1991 by Venue & Xerox Corporation.
13-
1412
(PRETTYCOMPRINT TEXECCOMS)
1513

1614
(RPAQQ TEXECCOMS
@@ -186,28 +184,24 @@
186184
TEXSTREAM)))
187185

188186
(TEXEC.DEFAULT.MENUFN
189-
(LAMBDA (W) (* \; "Edited 13-Jun-90 00:16 by mitani")
187+
(LAMBDA (W) (* \; "Edited 28-Mar-2024 00:06 by rmk")
188+
(* \; "Edited 13-Jun-90 00:16 by mitani")
190189

191-
(* |Default| |User| F\n |for| TEXEC |windows--displays| \a |menu| |of| |items|
192-
 & |acts| |on| |the| |commands| |received.|)
190+
(* |;;|
191+
 "Default User Fn for TEXEC windows--displays a menu of items & acts on the commands received.")
193192

194-
(PROG ((TEXTOBJ (WINDOWPROP W 'TEXTOBJ))
193+
(PROG ((TEXTOBJ (TEXTOBJ W))
195194
(WMENU (WINDOWPROP W 'TEDIT.MENU))
196195
THISMENU CH OFILE OCURSOR PCTB LINES SEL ITEM)
197196
(COND
198197
((EQ (|fetch| (TEXTOBJ EDITOPACTIVE) |of| TEXTOBJ)
199-
T) (* |We're| |busy| |doing|
200-
 |something,| |but| |not| |sure|
201-
 |what.| |Give| \a |general|
202-
 "please wait" |msg|)
198+
T) (* \;
199+
 "We're busy doing something, but not sure what. Give a general 'please wait' msg")
203200
(TEDIT.PROMPTPRINT TEXTOBJ "Edit operation in progress; please wait." T)
204201
(RETURN))
205-
((|fetch| (TEXTOBJ EDITOPACTIVE) |of| TEXTOBJ)
206-
(* W\e |know| |specifically|
207-
 |what's| |happening.|
208-
 |Tell| |him|)
209-
(TEDIT.PROMPTPRINT TEXTOBJ (CONCAT (|fetch| (TEXTOBJ EDITOPACTIVE) |of| TEXTOBJ
210-
)
202+
((|fetch| (TEXTOBJ EDITOPACTIVE) |of| TEXTOBJ) (* \;
203+
 "We know specifically what's happening. Tell him")
204+
(TEDIT.PROMPTPRINT TEXTOBJ (CONCAT (|fetch| (TEXTOBJ EDITOPACTIVE) |of| TEXTOBJ)
211205
" in progress; please wait.")
212206
T)
213207
(RETURN)))
@@ -222,37 +216,31 @@
222216
(ERSETQ (RESETLST
223217
(RESETSAVE (\\TEDIT.MARKACTIVE TEXTOBJ)
224218
'(AND (\\TEDIT.MARKINACTIVE OLDVALUE)))
225-
(|replace| (TEXTOBJ EDITOPACTIVE) |of| TEXTOBJ
226-
|with| (OR (CAR ITEM)
227-
T)) (* S\o |we| |ca| |ntell| |the| |guy|
228-
 WHAT |op| |is| |active.|)
219+
(|replace| (TEXTOBJ EDITOPACTIVE) |of| TEXTOBJ |with| (OR (CAR ITEM)
220+
T))
221+
(* \;
222+
 "So we ca ntell the guy WHAT op is active.")
229223
(SELECTQ (CAR ITEM)
230224
(|Put| (TEDIT.PUT TEXTOBJ NIL NIL (TEXTPROP TEXTOBJ 'CLEARPUT)))
231225
(|Plain-Text| (TEDIT.PUT TEXTOBJ NIL NIL T))
232-
(|Old-Format| (* |Write| |out| |the| |file| |in|
233-
 |the| OLD |TEdit| |format.|)
226+
(|Old-Format| (* \;
227+
 "Write out the file in the OLD TEdit format.")
234228
(TEDIT.PUT TEXTOBJ NIL NIL NIL T))
235-
(|Get| (* |Get| \a |new| |file|
236-
 (|overwriting| |the| |one| |being|
237-
 |edited.|))
229+
(|Get| (* \;
230+
 "Get a new file (overwriting the one being edited.)")
238231
(TEXEC.GET TEXTOBJ NIL (TEXTPROP TEXTOBJ 'CLEARGET)))
239232
(|Unformatted Get|
240233
(TEXEC.GET TEXTOBJ NIL T))
241-
(|Include| (* |Insert| \a |file| |where| |the|
242-
 |caret| |is|)
234+
(|Include| (* \; "Insert a file where the caret is")
243235
(TEXEC.INCLUDE TEXTOBJ))
244-
(|ForwardFind| (* |Normal| |forward| |search|
245-
 |Find|)
236+
(|ForwardFind| (* \; "Normal forward search Find")
246237
(TEXEC.FIND.FORWARD TEXTOBJ))
247-
(|BackwardFind| (* |Backward| |search| |Find|)
238+
(|BackwardFind| (* \; "Backward search Find")
248239
(TEXEC.FIND.BACKWARD TEXTOBJ))
249240
(|Limit| (SETQ TEXEC.BUFFERLIMIT (RNUMBER)))
250241
(COND
251-
((CAR ITEM)
252-
253-
(* |This| |is| \a |user-supplied| |entry.|
254-
 |Get| |the| |function,| |and| |apply| |it| |to| |the| TEXTSTREAM |for| |him|)
255-
242+
((CAR ITEM) (* \;
243+
 "This is a user-supplied entry. Get the function, and apply it to the TEXTSTREAM for him")
256244
(APPLY* (CAR ITEM)
257245
(|fetch| (TEXTOBJ STREAMHINT) |of| TEXTOBJ))))))))))
258246

@@ -1009,58 +997,44 @@
1009997
""))))
1010998

1011999
(TEXEC.SHRINK.ICONCREATE
1012-
(LAMBDA (W ICON ICONW) (* AJB " 7-Jan-86 16:37")
1013-
(* |Create| |the| |icon| |that|
1014-
 |represents| |this| |window.|)
1015-
(PROG ((ICON (WINDOWPROP W 'ICON))
1016-
(ICONTITLE (WINDOWPROP W 'TEDIT.ICON.TITLE))
1017-
(SHRINKFN (WINDOWPROP W 'SHRINKFN)))
1018-
(COND
1019-
((NOT (WINDOWPROP W 'TEXTOBJ))
1020-
1021-
(* |This| |isn't| |really| \a |TEdit| |window| |any| |more.|
1022-
 |Don't| |do| |anything|)
1023-
1024-
NIL)
1025-
((WINDOWPROP W 'TEDITMENU) (* |This| |is| \a |text| |menu,| |and|
1026-
 |shrinks| |without| |trace.|)
1027-
NIL)
1028-
((OR (IGREATERP (FLENGTH SHRINKFN)
1029-
3)
1030-
(AND (NOT (FMEMB 'SHRINKATTACHEDWINDOWS SHRINKFN))
1031-
(IGREATERP (FLENGTH SHRINKFN)
1032-
2)))
1033-
1034-
(* |There| |are| |other| |functions| |that| |expect| |to| |handle| |this.|
1035-
 |Don't| |bother.|)
1036-
1037-
NIL)
1038-
((OR (AND ICONTITLE (EQUAL ICONTITLE (PROCESSPROP (WINDOWPROP W 'PROCESS)
1039-
'NAME)))
1040-
(AND (NOT ICONTITLE)
1041-
ICON))
1042-
1043-
(* |we| |built| |this| |and| |the| |title| |is| |the| |same,| |or| |he| |has|
1044-
 |already| |put| |an| |icon| |on| |this.|
1045-
 D\o |nothing|)
1046-
1047-
NIL)
1048-
(ICON
1049-
1050-
(* |There's| |an| |existing| |icon| |window;|
1051-
 |change| |the| |title| |in| |it|)
1052-
1000+
(LAMBDA (W ICON ICONW) (* \; "Edited 28-Mar-2024 00:08 by rmk")
1001+
(* AJB " 7-Jan-86 16:37")
1002+
(* \;
1003+
 "Create the icon that represents this window.")
1004+
(CL:WHEN (TEXTSTREAM W T)
1005+
(LET ((ICON (WINDOWPROP W 'ICON))
1006+
(ICONTITLE (WINDOWPROP W 'TEDIT.ICON.TITLE))
1007+
(SHRINKFN (WINDOWPROP W 'SHRINKFN)))
1008+
(COND
1009+
((WINDOWPROP W 'TEDITMENU) (* \;
1010+
 "This is a text menu, and shrinks without trace.")
1011+
)
1012+
((OR (IGREATERP (FLENGTH SHRINKFN)
1013+
3)
1014+
(AND (NOT (FMEMB 'SHRINKATTACHEDWINDOWS SHRINKFN))
1015+
(IGREATERP (FLENGTH SHRINKFN)
1016+
2))) (* \;
1017+
 "There are other functions that expect to handle this. Don't bother.")
1018+
)
1019+
((OR (AND ICONTITLE (EQUAL ICONTITLE (PROCESSPROP (WINDOWPROP W 'PROCESS)
1020+
'NAME)))
1021+
(AND (NOT ICONTITLE)
1022+
ICON)) (* \;
1023+
 "we built this and the title is the same, or he has already put an icon on this. Do nothing")
1024+
)
1025+
(ICON (* \;
1026+
 "There's an existing icon window; change the title in it")
1027+
(WINDOWPROP W 'TEDIT.ICON.TITLE (SETQ ICONTITLE (PROCESSPROP
1028+
(WINDOWPROP W 'PROCESS)
1029+
'NAME)))
1030+
(ICONTITLE ICONTITLE NIL NIL ICON))
1031+
(T (* \; "install a new icon")
10531032
(WINDOWPROP W 'TEDIT.ICON.TITLE (SETQ ICONTITLE (PROCESSPROP (WINDOWPROP
10541033
W
10551034
'PROCESS)
10561035
'NAME)))
1057-
(ICONTITLE ICONTITLE NIL NIL ICON))
1058-
(T (* |install| \a |new| |icon|)
1059-
(WINDOWPROP W 'TEDIT.ICON.TITLE (SETQ ICONTITLE (PROCESSPROP (WINDOWPROP W
1060-
'PROCESS)
1061-
'NAME)))
1062-
(WINDOWPROP W 'ICON (TITLEDICONW TEXEC.TITLED.ICON.TEMPLATE ICONTITLE TEXEC.ICON.FONT
1063-
NIL T '(BOTTOM LEFT))))))
1036+
(WINDOWPROP W 'ICON (TITLEDICONW TEXEC.TITLED.ICON.TEMPLATE ICONTITLE
1037+
TEXEC.ICON.FONT NIL T '(BOTTOM LEFT)))))))
10641038
(WINDOWPROP W 'ICON)))
10651039

10661040
(TEXEC.FILLBUFFER
@@ -3009,23 +2983,22 @@
30092983
(RPAQQ |BackgroundMenu| NIL)
30102984

30112985
(RPAQ? TEXEC.BUFFERLIMIT 10000)
3012-
(PUTPROPS TEXEC COPYRIGHT ("Venue & Xerox Corporation" 1985 1900 1986 1987 1988 1989 1990 1991))
30132986
(DECLARE\: DONTCOPY
3014-
(FILEMAP (NIL (3083 171708 (TEXEC.BACKSKREAD 3093 . 7717) (TEXEC.OPENTEXTSTREAM 7719 . 9777) (
3015-
TEXEC.DEFAULT.MENUFN 9779 . 14333) (TEXEC.DO?CMD 14335 . 19653) (TEXEC.CREATEMENU 19655 . 20113) (
3016-
TEXEC.GET 20115 . 28950) (TEXEC.INCLUDE 28952 . 42337) (TEXEC.FIND.FORWARD 42339 . 55227) (
3017-
TEXEC.FIND.BACKWARD 55229 . 68731) (TEXEC.MENU.WHENHELDFN 68733 . 69392) (TEXEC.SHRINK.ICONCREATE
3018-
69394 . 72197) (TEXEC.FILLBUFFER 72199 . 88633) (TEXEC.FILLBUFFER.TCLASS 88635 . 94975) (
3019-
TEXEC.CHSELPENDING 94977 . 103467) (TEXEC.FILLBUFFER.CHARDELETE 103469 . 105524) (
3020-
TEXEC.FILLBUFFER.WORDDELETE 105526 . 110654) (TEXEC.FILLBUFFER.LINEDELETE 110656 . 113538) (
3021-
TEXEC.PARENCOUNT 113540 . 114929) (TEXEC.PARENMATCH 114931 . 116471) (TEXEC.FLASHCARET 116473 . 119132
3022-
) (TEXEC.TEXTSTREAM.TO.LINEBUF 119134 . 121821) (TEXEC.FIX 121823 . 124992) (TEXEC.NTHBUFCHARBACK
3023-
124994 . 126057) (TEXEC.NTHBACKCHNUM 126059 . 127344) (TEXEC.EOTP 127346 . 128079) (TEXEC.GETKEY
3024-
128081 . 130997) (TEXEC.INSERTCHAR 130999 . 133300) (TEXEC.DELETE 133302 . 134077) (TEXEC.\\CHDEL1
3025-
134079 . 137204) (TEXEC.?EQUAL 137206 . 138255) (TEDIT.SCROLL? 138257 . 143220) (TEXEC.DISPLAYTEXT
3026-
143222 . 149997) (\\TEXEC.TEXTBOUT 149999 . 153007) (\\TEXEC.TEXTBOUT1 153009 . 158643) (
3027-
\\TEXEC.TEXTBOUT2 158645 . 160976) (\\TEXEC.TEXTBOUT3 160978 . 162368) (\\TEXEC.TEXTBOUT4 162370 .
3028-
164413) (\\TEXEC.SELFN 164415 . 165790) (TEXEC.PRINTARGS 165792 . 170755) (TEXEC.PROCENTRYFN 170757 .
3029-
171298) (TEXEC.PROCEXITFN 171300 . 171706)) (171768 178143 (TEXEC 171778 . 176200) (TTEXEC 176202 .
3030-
178141)))))
2987+
(FILEMAP (NIL (3048 171118 (TEXEC.BACKSKREAD 3058 . 7682) (TEXEC.OPENTEXTSTREAM 7684 . 9742) (
2988+
TEXEC.DEFAULT.MENUFN 9744 . 13790) (TEXEC.DO?CMD 13792 . 19110) (TEXEC.CREATEMENU 19112 . 19570) (
2989+
TEXEC.GET 19572 . 28407) (TEXEC.INCLUDE 28409 . 41794) (TEXEC.FIND.FORWARD 41796 . 54684) (
2990+
TEXEC.FIND.BACKWARD 54686 . 68188) (TEXEC.MENU.WHENHELDFN 68190 . 68849) (TEXEC.SHRINK.ICONCREATE
2991+
68851 . 71607) (TEXEC.FILLBUFFER 71609 . 88043) (TEXEC.FILLBUFFER.TCLASS 88045 . 94385) (
2992+
TEXEC.CHSELPENDING 94387 . 102877) (TEXEC.FILLBUFFER.CHARDELETE 102879 . 104934) (
2993+
TEXEC.FILLBUFFER.WORDDELETE 104936 . 110064) (TEXEC.FILLBUFFER.LINEDELETE 110066 . 112948) (
2994+
TEXEC.PARENCOUNT 112950 . 114339) (TEXEC.PARENMATCH 114341 . 115881) (TEXEC.FLASHCARET 115883 . 118542
2995+
) (TEXEC.TEXTSTREAM.TO.LINEBUF 118544 . 121231) (TEXEC.FIX 121233 . 124402) (TEXEC.NTHBUFCHARBACK
2996+
124404 . 125467) (TEXEC.NTHBACKCHNUM 125469 . 126754) (TEXEC.EOTP 126756 . 127489) (TEXEC.GETKEY
2997+
127491 . 130407) (TEXEC.INSERTCHAR 130409 . 132710) (TEXEC.DELETE 132712 . 133487) (TEXEC.\\CHDEL1
2998+
133489 . 136614) (TEXEC.?EQUAL 136616 . 137665) (TEDIT.SCROLL? 137667 . 142630) (TEXEC.DISPLAYTEXT
2999+
142632 . 149407) (\\TEXEC.TEXTBOUT 149409 . 152417) (\\TEXEC.TEXTBOUT1 152419 . 158053) (
3000+
\\TEXEC.TEXTBOUT2 158055 . 160386) (\\TEXEC.TEXTBOUT3 160388 . 161778) (\\TEXEC.TEXTBOUT4 161780 .
3001+
163823) (\\TEXEC.SELFN 163825 . 165200) (TEXEC.PRINTARGS 165202 . 170165) (TEXEC.PROCENTRYFN 170167 .
3002+
170708) (TEXEC.PROCEXITFN 170710 . 171116)) (171178 177553 (TEXEC 171188 . 175610) (TTEXEC 175612 .
3003+
177551)))))
30313004
STOP

‎library/TEXEC.LCOM

174 Bytes
Binary file not shown.

0 commit comments

Comments
 (0)