Skip to content

Commit a4da0ec

Browse files
rmkaplanrmkaplan
authoredMar 11, 2025
Update Tedit field names in Lafite (#2034)
Lafite is not in the fuller ms database, so I missed these references in TEDIT-INDENT. But note also: there are 2 definitions of the function \GV.PARSERECIPIENTS1, one on lafite/TEDIT-PRIVATEDL and one on internal/MAILCLIENT. The one on TEDIT-PRIVATEDL references the variable ADDRESSPARSERRDTBL, which is not initialized.
·
medley-250324-3d5d9668medley-250310-a4da0ec5
2 parents 02411ef + c7f08aa commit a4da0ec

8 files changed

+276
-278
lines changed
 

‎library/lafite/LAFITE-COMMANDS

+98-99
Large diffs are not rendered by default.

‎library/lafite/LAFITE-COMMANDS.LCOM

131 Bytes
Binary file not shown.

‎library/lafite/LAFITE-INDENT

+90-84
Large diffs are not rendered by default.

‎library/lafite/LAFITE-INDENT.LCOM

243 Bytes
Binary file not shown.

‎library/lafite/LAFITE-SEND

+77-84
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 "23-Feb-2024 22:24:01" {WMEDLEY}<library>lafite>LAFITE-SEND.;2 100561
3+
(FILECREATED "15-Feb-2025 13:05:38" {WMEDLEY}<library>lafite>LAFITE-SEND.;4 100003
44

55
:EDIT-BY rmk
66

7-
:CHANGES-TO (VARS LAFITE-SENDCOMS)
7+
:CHANGES-TO (FNS \SENDMSG.CHANGE.MODE)
88

9-
:PREVIOUS-DATE "23-Feb-2024 22:03:43" {WMEDLEY}<library>lafite>LAFITE-SEND.;1)
9+
:PREVIOUS-DATE "23-Feb-2024 22:24:01" {WMEDLEY}<library>lafite>LAFITE-SEND.;2)
1010

1111

1212
(PRETTYCOMPRINT LAFITE-SENDCOMS)
@@ -222,14 +222,14 @@
222222
(ERROR!])
223223

224224
(\SENDMSG.CHANGE.MODE
225-
[LAMBDA (WINDOW TEXTSTREAM MENU ITEM) (* ; "Edited 5-Jan-90 18:06 by bvm")
225+
[LAMBDA (WINDOW TEXTSTREAM MENU ITEM) (* ; "Edited 15-Feb-2025 13:05 by rmk")
226+
(* ; "Edited 5-Jan-90 18:06 by bvm")
226227
(LET*
227228
[(OLDMODE (TEXTPROP TEXTSTREAM 'LAFITEMODE))
228-
(OTHERMODES (for MODE in LAFITEMODELST unless (OR (EQ (fetch (LAFITEOPS
229-
LAFITEMODE)
230-
of MODE)
231-
OLDMODE)
232-
(NLISTP (CDR MODE)))
229+
(OTHERMODES (for MODE in LAFITEMODELST unless (OR (EQ (fetch (LAFITEOPS LAFITEMODE)
230+
of MODE)
231+
OLDMODE)
232+
(NLISTP (CDR MODE)))
233233
collect (fetch (LAFITEOPS LAFITEMODE) of MODE)))
234234
(NEWMODE (if (NULL OTHERMODES)
235235
then (\SENDMESSAGE.PROMPT WINDOW "There are no other modes")
@@ -244,58 +244,51 @@
244244
N N2)
245245
(if (NULL NEWMODEDATA)
246246
then (\SENDMESSAGE.PROMPT WINDOW (CL:FORMAT NIL
247-
"Can't authenticate user in ~A mode"
248-
NEWMODE))
249-
else (LET ((OLDNAME (fetch (LAFITEMODEDATA FULLUSERNAME) of OLDMODEDATA)
250-
)
251-
(END (TEDIT.FIND TEXTSTREAM "
247+
"Can't authenticate user in ~A mode"
248+
NEWMODE))
249+
else (LET ((OLDNAME (fetch (LAFITEMODEDATA FULLUSERNAME) of OLDMODEDATA))
250+
(END (TEDIT.FIND TEXTSTREAM "
252251

253252
" 1))
254-
START N LEN NEW OLDSEL)
255-
(if END
256-
then (add END 1)) (* ;
257-
 "Don't search past end of header. END now points at second cr.")
258-
[for FIELD in '("cc" "Reply-to")
259-
when [AND (SETQ N (\SENDMSG.FIND.FIELD TEXTSTREAM FIELD END
260-
))
261-
(PROGN (SETQ LEN (CADR N))
262-
(SETQ N (CAR N))
263-
(SETQ START
264-
(STRPOS OLDNAME
265-
(SETQ OLDSEL
266-
(TEDIT.SEL.AS.STRING TEXTSTREAM
267-
(create SELECTION
268-
CH# _ N
269-
DCH _ LEN)))
270-
NIL NIL NIL NIL UPPERCASEARRAY]
271-
do (* ; "Change field containing old user name to new. This is much more complicated than it needs to be because TEDIT.FIND is case sensitive.")
272-
(TEDIT.DELETE TEXTSTREAM N LEN)
273-
(TEDIT.INSERT TEXTSTREAM
274-
(SETQ NEW (CONCAT (OR (SUBSTRING OLDSEL 1 (SUB1 START)
275-
)
276-
"")
277-
(fetch (LAFITEMODEDATA
278-
FULLUSERNAME)
279-
of NEWMODEDATA)
280-
(OR (SUBSTRING OLDSEL
281-
(+ START (NCHARS OLDNAME))
282-
)
283-
"")))
284-
N)
285-
(AND END (add END (- (NCHARS NEW)
286-
LEN]
287-
(if (SETQ N (\SENDMSG.FIND.FIELD TEXTSTREAM "To" END))
288-
then (* ;
289-
 "Leave the To field selected for address modification")
290-
(TEDIT.SETSEL TEXTSTREAM (CAR N)
291-
(CADR N)
292-
'RIGHT T))
293-
(TEXTPROP TEXTSTREAM 'LAFITEMODE NEWMODE)
294-
(if (SETQ N (STRPOS (CONCAT "(" OLDMODE ")")
295-
TITLE))
296-
then (WINDOWPROP WINDOW 'TITLE (CONCAT (SUBSTRING TITLE 1 N)
297-
NEWMODE ")")))
298-
(\SENDMESSAGE.PROMPT WINDOW "Message mode is now " NEWMODE]
253+
START N LEN NEW OLDSEL)
254+
(if END
255+
then (add END 1)) (* ;
256+
 "Don't search past end of header. END now points at second cr.")
257+
[for FIELD in '("cc" "Reply-to")
258+
when [AND (SETQ N (\SENDMSG.FIND.FIELD TEXTSTREAM FIELD END))
259+
(PROGN (SETQ LEN (CADR N))
260+
(SETQ N (CAR N))
261+
(SETQ START (STRPOS OLDNAME (SETQ OLDSEL
262+
(TEDIT.SEL.AS.STRING
263+
TEXTSTREAM N LEN))
264+
NIL NIL NIL NIL UPPERCASEARRAY]
265+
do (* ; "Change field containing old user name to new. This is much more complicated than it needs to be because TEDIT.FIND is case sensitive.")
266+
(TEDIT.DELETE TEXTSTREAM N LEN)
267+
(TEDIT.INSERT TEXTSTREAM (SETQ NEW
268+
(CONCAT (OR (SUBSTRING OLDSEL 1
269+
(SUB1 START))
270+
"")
271+
(fetch (LAFITEMODEDATA FULLUSERNAME
272+
) of NEWMODEDATA)
273+
(OR (SUBSTRING OLDSEL
274+
(+ START (NCHARS OLDNAME
275+
)))
276+
"")))
277+
N)
278+
(AND END (add END (- (NCHARS NEW)
279+
LEN]
280+
(if (SETQ N (\SENDMSG.FIND.FIELD TEXTSTREAM "To" END))
281+
then (* ;
282+
 "Leave the To field selected for address modification")
283+
(TEDIT.SETSEL TEXTSTREAM (CAR N)
284+
(CADR N)
285+
'RIGHT T))
286+
(TEXTPROP TEXTSTREAM 'LAFITEMODE NEWMODE)
287+
(if (SETQ N (STRPOS (CONCAT "(" OLDMODE ")")
288+
TITLE))
289+
then (WINDOWPROP WINDOW 'TITLE (CONCAT (SUBSTRING TITLE 1 N)
290+
NEWMODE ")")))
291+
(\SENDMESSAGE.PROMPT WINDOW "Message mode is now " NEWMODE]
299292

300293
(* ;; "Exit with error so that the window is restored to previous state")
301294

@@ -1761,29 +1754,29 @@ cc: ~A
17611754
)
17621755
)
17631756
(DECLARE%: DONTCOPY
1764-
(FILEMAP (NIL (5214 28191 (DOLAFITESENDINGCOMMAND 5224 . 5714) (\SENDMESSAGE.INITIATE 5716 . 7655) (
1765-
\SENDMSG.DELIVER 7657 . 8265) (\SENDMSG.EXIT.TEDIT 8267 . 8638) (\SENDMSG.SAVE.FORM 8640 . 10627) (
1766-
\LAFITE.HEADER.EOF 10629 . 10922) (\LAFITE.INSERT.REPLYTO 10924 . 11532) (\SENDMSG.REPLYTO 11534 .
1767-
12093) (\SENDMSG.CHANGE.MODE 12095 . 17671) (\SENDMSG.FIND.FIELD 17673 . 18183) (\SENDMESSAGE.PARSE
1768-
18185 . 18981) (\LAFITE.PREPARE.SEND 18983 . 21816) (\LAFITE.PREPARE.ERROR 21818 . 23000) (
1769-
\LAFITE.CHOOSE.MSG.FORMAT 23002 . 25643) (LAFITE.MAKE.PLAIN.TEXTSTREAM 25645 . 26570) (
1770-
\SENDMESSAGE.MENUPROMPT 26572 . 27435) (\SENDMESSAGE.PROMPT 27437 . 27973) (\SENDMESSAGEFAIL 27975 .
1771-
28189)) (28192 52854 (\SENDMESSAGE 28202 . 29554) (\SENDMESSAGE.RESTARTABLE 29556 . 34757) (
1772-
\SENDMESSAGE.CLEANUP 34759 . 34975) (\SENDMESSAGE.MAKEWINDOW 34977 . 41150) (MAKELAFITEDELIVERMENU
1773-
41152 . 41459) (\LAFITE.CLOSEMSG? 41461 . 42411) (\LAFITE.AFTER.DELIVER 42413 . 45732) (
1774-
\LAFITE.UNSENT.ICON 45734 . 46044) (\LAFITE.FETCH.SUBJECT 46046 . 46846) (LAFITE.SENDMESSAGE 46848 .
1775-
47741) (\SENDMESSAGE0 47743 . 50607) (LA.ASSURE.PROMPT.WINDOW 50609 . 51506) (\LAFITE.SEND.FAIL 51508
1776-
. 51979) (\LAFITE.INVALID.RECIPIENTS 51981 . 52439) (\SENDMESSAGE.ABORT 52441 . 52852)) (52886 62799
1777-
(\OUTBOX.CREATE 52896 . 54359) (\OUTBOX.RESET 54361 . 54854) (\OUTBOX.CLOSEFN 54856 . 54996) (
1778-
\OUTBOX.REPAINTFN 54998 . 55661) (\OUTBOX.RESHAPEFN 55663 . 56946) (\OUTBOX.SHADEITEM 56948 . 57621) (
1779-
\OUTBOX.BUTTONFN 57623 . 60471) (\OUTBOX.DISPLAYLINE 60473 . 60967) (\OUTBOX.ADD.ITEM 60969 . 62797))
1780-
(63095 79503 (\LAFITE.MESSAGEFORM 63105 . 67448) (MAKELAFITESUPPORTFORM 67450 . 67639) (
1781-
MAKELISPSUPPORTFORM 67641 . 67807) (MAKEXXXSUPPORTFORM 67809 . 71858) (MAKENEWMESSAGEFORM 71860 .
1782-
72816) (MAKELAFITEPRIVATEFORMSITEMS 72818 . 73246) (\LAFITE.UNCACHE.MESSAGEFORM 73248 . 73701) (
1783-
\LAFITE.DELETE.MESSAGEFORM 73703 . 74304) (\LAFITE.SELECT.FORM 74306 . 74661) (
1784-
\LAFITE.DELETE.FORM.INTERNAL 74663 . 75807) (\LAFITE.READ.FORM 75809 . 78546) (\LAFITE.FIND.TEMPLATE
1785-
78548 . 79501)) (79527 87258 (\LAFITE.ANSWER 79537 . 79942) (\LAFITE.ANSWER.PROC 79944 . 81838) (
1786-
MAKEANSWERFORM 81840 . 84370) (LA.PRINT.COMMA.LIST 84372 . 84858) (LAFITE.FILL.IN.ANSWER.FORM 84860 .
1787-
87256)) (87283 93479 (\LAFITE.FORWARD 87293 . 87701) (\LAFITE.FORWARD.PROC 87703 . 89692) (
1788-
MAKEFORWARDFORM 89694 . 93477)))))
1757+
(FILEMAP (NIL (5218 27633 (DOLAFITESENDINGCOMMAND 5228 . 5718) (\SENDMESSAGE.INITIATE 5720 . 7659) (
1758+
\SENDMSG.DELIVER 7661 . 8269) (\SENDMSG.EXIT.TEDIT 8271 . 8642) (\SENDMSG.SAVE.FORM 8644 . 10631) (
1759+
\LAFITE.HEADER.EOF 10633 . 10926) (\LAFITE.INSERT.REPLYTO 10928 . 11536) (\SENDMSG.REPLYTO 11538 .
1760+
12097) (\SENDMSG.CHANGE.MODE 12099 . 17113) (\SENDMSG.FIND.FIELD 17115 . 17625) (\SENDMESSAGE.PARSE
1761+
17627 . 18423) (\LAFITE.PREPARE.SEND 18425 . 21258) (\LAFITE.PREPARE.ERROR 21260 . 22442) (
1762+
\LAFITE.CHOOSE.MSG.FORMAT 22444 . 25085) (LAFITE.MAKE.PLAIN.TEXTSTREAM 25087 . 26012) (
1763+
\SENDMESSAGE.MENUPROMPT 26014 . 26877) (\SENDMESSAGE.PROMPT 26879 . 27415) (\SENDMESSAGEFAIL 27417 .
1764+
27631)) (27634 52296 (\SENDMESSAGE 27644 . 28996) (\SENDMESSAGE.RESTARTABLE 28998 . 34199) (
1765+
\SENDMESSAGE.CLEANUP 34201 . 34417) (\SENDMESSAGE.MAKEWINDOW 34419 . 40592) (MAKELAFITEDELIVERMENU
1766+
40594 . 40901) (\LAFITE.CLOSEMSG? 40903 . 41853) (\LAFITE.AFTER.DELIVER 41855 . 45174) (
1767+
\LAFITE.UNSENT.ICON 45176 . 45486) (\LAFITE.FETCH.SUBJECT 45488 . 46288) (LAFITE.SENDMESSAGE 46290 .
1768+
47183) (\SENDMESSAGE0 47185 . 50049) (LA.ASSURE.PROMPT.WINDOW 50051 . 50948) (\LAFITE.SEND.FAIL 50950
1769+
. 51421) (\LAFITE.INVALID.RECIPIENTS 51423 . 51881) (\SENDMESSAGE.ABORT 51883 . 52294)) (52328 62241
1770+
(\OUTBOX.CREATE 52338 . 53801) (\OUTBOX.RESET 53803 . 54296) (\OUTBOX.CLOSEFN 54298 . 54438) (
1771+
\OUTBOX.REPAINTFN 54440 . 55103) (\OUTBOX.RESHAPEFN 55105 . 56388) (\OUTBOX.SHADEITEM 56390 . 57063) (
1772+
\OUTBOX.BUTTONFN 57065 . 59913) (\OUTBOX.DISPLAYLINE 59915 . 60409) (\OUTBOX.ADD.ITEM 60411 . 62239))
1773+
(62537 78945 (\LAFITE.MESSAGEFORM 62547 . 66890) (MAKELAFITESUPPORTFORM 66892 . 67081) (
1774+
MAKELISPSUPPORTFORM 67083 . 67249) (MAKEXXXSUPPORTFORM 67251 . 71300) (MAKENEWMESSAGEFORM 71302 .
1775+
72258) (MAKELAFITEPRIVATEFORMSITEMS 72260 . 72688) (\LAFITE.UNCACHE.MESSAGEFORM 72690 . 73143) (
1776+
\LAFITE.DELETE.MESSAGEFORM 73145 . 73746) (\LAFITE.SELECT.FORM 73748 . 74103) (
1777+
\LAFITE.DELETE.FORM.INTERNAL 74105 . 75249) (\LAFITE.READ.FORM 75251 . 77988) (\LAFITE.FIND.TEMPLATE
1778+
77990 . 78943)) (78969 86700 (\LAFITE.ANSWER 78979 . 79384) (\LAFITE.ANSWER.PROC 79386 . 81280) (
1779+
MAKEANSWERFORM 81282 . 83812) (LA.PRINT.COMMA.LIST 83814 . 84300) (LAFITE.FILL.IN.ANSWER.FORM 84302 .
1780+
86698)) (86725 92921 (\LAFITE.FORWARD 86735 . 87143) (\LAFITE.FORWARD.PROC 87145 . 89134) (
1781+
MAKEFORWARDFORM 89136 . 92919)))))
17891782
STOP

‎library/lafite/LAFITE-SEND.LCOM

-90 Bytes
Binary file not shown.

‎library/lafite/LAFITE-TEDIT

+11-11
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 "23-Feb-2024 22:24:01" {WMEDLEY}<library>lafite>LAFITE-TEDIT.;2 6592
3+
(FILECREATED "15-Feb-2025 14:03:21" {WMEDLEY}<library>lafite>LAFITE-TEDIT.;4 6618
44

55
:EDIT-BY rmk
66

7-
:CHANGES-TO (VARS LAFITE-TEDITCOMS)
7+
:CHANGES-TO (FNS TEDIT.ASSURE.NO.BACKING.FILE)
88

9-
:PREVIOUS-DATE "23-Feb-2024 22:09:24" {WMEDLEY}<library>lafite>LAFITE-TEDIT.;1)
9+
:PREVIOUS-DATE "23-Feb-2024 22:24:01" {WMEDLEY}<library>lafite>LAFITE-TEDIT.;2)
1010

1111

1212
(PRETTYCOMPRINT LAFITE-TEDITCOMS)
@@ -74,26 +74,26 @@
7474
(TEXTPROP TEXTSTREAM '\WINDOW NIL])
7575

7676
(TEDIT.ASSURE.NO.BACKING.FILE
77-
[LAMBDA (TEXTSTREAM) (* ; "Edited 13-Jan-2024 18:08 by rmk")
77+
[LAMBDA (TEXTSTREAM) (* ; "Edited 15-Feb-2025 14:03 by rmk")
78+
(* ; "Edited 13-Jan-2024 18:08 by rmk")
7879
(* ; "Edited 18-Jun-2023 09:31 by rmk")
7980
(* ; "Edited 29-Oct-2022 22:34 by rmk")
8081
(* ; "Edited 20-May-92 11:25 by rmk:")
8182

8283
(* ;; "This puts the contents of TEXTSTREAM to a nodircore file (if it isn't already on nodircore), and then sets it up for continuing in the current editing session. Essentially eliminates the file-system backing store.")
8384

8485
(LET* ((TEXTOBJ (TEXTOBJ TEXTSTREAM))
85-
(OFILE (GETTOBJ TEXTOBJ TXTFILE))
86+
(OFILE (GETTEXTPROP TEXTSTREAM 'FILESTREAM))
8687
NEWFILE)
87-
(CL:WHEN [AND (TYPE? STREAM OFILE)
88-
(NEQ 'NODIRCORE (FETCH (FDEV DEVICENAME) OF (FETCH (STREAM DEVICE)
89-
OF (TRUEFILENAME OFILE]
88+
(CL:WHEN [AND OFILE (NEQ 'NODIRCORE (FILENAMEFIELD (TRUEFILENAME OFILE)
89+
'HOST]
9090
(SETQ NEWFILE (OPENSTREAM '{NODIRCORE} 'BOTH))
9191

9292
(* ;; "\TEDIT.PUT.PCTB will save the current text and looks in NEWFILE, leaving it open. It returns the sequence of new looks for continued editing, where all the file pieces point to their position in NEWFILE. But the file PCONTENTS do not yet point to the new stream. ")
9393

9494
(CLOSEF? OFILE)
9595
(\TEDIT.INSERT.NEWPIECES NEWFILE TEXTOBJ (\TEDIT.PUT.PCTB TEXTOBJ NEWFILE NIL T))
96-
(FSETTOBJ TEXTOBJ TXTFILE NIL)
96+
(PUTTEXTPROP TEXTOBJ 'TXTFILE NIL)
9797
(PUTTEXTPROP TEXTOBJ 'CACHE NEWFILE)
9898
TEXTSTREAM)])
9999

@@ -118,6 +118,6 @@
118118
)
119119
)
120120
(DECLARE%: DONTCOPY
121-
(FILEMAP (NIL (987 6361 (LA.ADJUST.FORMATTING 997 . 4043) (LA.DETACH.TEDIT 4045 . 4411) (
122-
TEDIT.ASSURE.NO.BACKING.FILE 4413 . 6079) (LA.WINDOW.FROM.TEXTSTREAM 6081 . 6359)))))
121+
(FILEMAP (NIL (998 6387 (LA.ADJUST.FORMATTING 1008 . 4054) (LA.DETACH.TEDIT 4056 . 4422) (
122+
TEDIT.ASSURE.NO.BACKING.FILE 4424 . 6105) (LA.WINDOW.FROM.TEXTSTREAM 6107 . 6385)))))
123123
STOP

‎library/lafite/LAFITE-TEDIT.LCOM

75 Bytes
Binary file not shown.

0 commit comments

Comments
 (0)
Please sign in to comment.