Skip to content

Commit 67a3e55

Browse files
committed
TEDIT-PF-SEE: Meta-T defaults to showing the definition in the current file
1 parent 37195dc commit 67a3e55

File tree

2 files changed

+28
-19
lines changed

2 files changed

+28
-19
lines changed

lispusers/TEDIT-PF-SEE

Lines changed: 28 additions & 19 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 "26-Mar-2025 10:09:16" {WMEDLEY}<lispusers>TEDIT-PF-SEE.;137 11103
3+
(FILECREATED "14-Apr-2025 22:00:54" {WMEDLEY}<lispusers>TEDIT-PF-SEE.;141 11757
44

55
:EDIT-BY rmk
66

7-
:CHANGES-TO (FNS PF-TEDIT)
7+
:CHANGES-TO (FNS PF-TEDIT PF-TEDIT-FROM-TEXT)
88

9-
:PREVIOUS-DATE "18-Feb-2025 23:39:40" {WMEDLEY}<lispusers>TEDIT-PF-SEE.;136)
9+
:PREVIOUS-DATE " 7-Apr-2025 23:03:54" {WMEDLEY}<lispusers>TEDIT-PF-SEE.;140)
1010

1111

1212
(PRETTYCOMPRINT TEDIT-PF-SEECOMS)
@@ -16,17 +16,19 @@
1616
(COMMANDS ts tf)
1717
(FILES (SYSLOAD)
1818
REGIONMANAGER VERSIONDEFS)
19+
(ALISTS (TEDIT.CHARACTIONS TEDIT-PF)
20+
(TEDIT.CHARBINDINGS TEDIT-PF))
1921
(P (MOVD? 'PFCOPYBYTES 'PFI.MAYBE.PP.DEFINITION)
2022
(MOVD? 'NILL (FUNCTION TEDIT.SETFUNCTION))
21-
(TEDIT.SETFUNCTION "Meta,T" (FUNCTION PF-TEDIT-FROM-TEXT))
22-
(TEDIT.SETFUNCTION "Meta,t" (FUNCTION PF-TEDIT-FROM-TEXT)))
23+
(TEDIT.INSTALL.CHARBINDINGS))
2324
(DECLARE%: DONTEVAL@LOAD DOEVAL@COMPILE DONTCOPY COMPILERVARS (ADDVARS (NLAMA)
2425
(NLAML)
2526
(LAMA])
2627
(DEFINEQ
2728

2829
(PF-TEDIT
29-
[LAMBDA (FN IFILES VERSION REPRINT) (* ; "Edited 26-Mar-2025 10:08 by rmk")
30+
[LAMBDA (FN IFILES VERSION REPRINT) (* ; "Edited 14-Apr-2025 22:00 by rmk")
31+
(* ; "Edited 26-Mar-2025 10:08 by rmk")
3032
(* ; "Edited 18-Feb-2025 23:39 by rmk")
3133
(* ; "Edited 6-Dec-2024 19:15 by rmk")
3234
(* ; "Edited 27-Aug-2024 13:03 by rmk")
@@ -67,8 +69,8 @@
6769
(SETQ REPRINT T)
6870
[SETQ IFILES (LDIFFERENCE IFILES '(t T])
6971
(CL:UNLESS IFILES
70-
(SETQ IFILES (APPEND (WHEREIS FN 'FNS T)
71-
(WHEREIS FN 'FUNCTIONS T))))
72+
(SETQ IFILES (WHEREIS FN '(FNS FUNCTIONS)
73+
T)))
7274
(IF IFILES
7375
THEN (* ; "skip compiled files")
7476

@@ -151,24 +153,29 @@
151153
ELSE (PRINTOUT T FN " has no function definition" T])
152154

153155
(PF-TEDIT-FROM-TEXT
154-
[LAMBDA (TSTREAM TEXTOBJ SEL) (* ; "Edited 5-Dec-2024 22:20 by rmk")
156+
[LAMBDA (TSTREAM TEXTOBJ SEL) (* ; "Edited 14-Apr-2025 21:59 by rmk")
157+
(* ; "Edited 7-Apr-2025 23:03 by rmk")
158+
(* ; "Edited 5-Dec-2024 22:20 by rmk")
155159
(* ; "Edited 26-Aug-2024 23:13 by rmk")
156160

157-
(* ;; "The function key for the meta,T and meta,t keys. This shows in a separate Tedit window the definition in TSTREAM of the function named by the selection SEL.")
161+
(* ;; "The function key for the meta,T and meta,t keys. This shows in a separate Tedit window the definition in TSTREAM of the function named by the selection SEL. If this TEDIT is open on a source file that contains the selected function, that definition is used. Otherwise, the first file that WHEREIS returns.")
158162

159163
(SETQ TSTREAM (TEXTSTREAM TSTREAM))
160164
(CL:UNLESS SEL
161165
(SETQ SEL (TEDIT.GETSEL TSTREAM)))
162-
(LET [[FILENAME (OR (TEXTPROP TSTREAM 'FILENAME)
166+
(LET ([THISFILE (OR (TEXTPROP TSTREAM 'FILENAME)
163167
(AND (\TEDIT.PRIMARYPANE TSTREAM)
164168
(CADR (WINDOWPROP (\TEDIT.PRIMARYPANE TSTREAM TSTREAM)
165169
'TF]
166-
(FN (MKATOM (TEDIT.SEL.AS.STRING TSTREAM SEL]
170+
(FN (MKATOM (TEDIT.SEL.AS.STRING TSTREAM SEL)))
171+
ALLFILES)
167172
(if (EQ 0 (NCHARS FN))
168173
then (TEDIT.PROMPTPRINT TSTREAM "Please select a function to display" T)
169-
elseif FILENAME
170-
then [PF-TEDIT FN (CAR (MEMB (FILENAMEFIELD FILENAME)
171-
(WHEREIS FN NIL T]
174+
elseif (SETQ ALLFILES (WHEREIS FN '(FNS FUNCTIONS)
175+
T))
176+
then (PF-TEDIT FN (CAR (OR (MEMB (FILENAMEFIELD THISFILE)
177+
ALLFILES)
178+
ALLFILES)))
172179
else (TEDIT.PROMPTPRINT TSTREAM (CONCAT FN " not found")
173180
T])
174181
)
@@ -189,13 +196,15 @@
189196
(FILESLOAD (SYSLOAD)
190197
REGIONMANAGER VERSIONDEFS)
191198

199+
(ADDTOVAR TEDIT.CHARACTIONS (TEDIT-PF PF-TEDIT-FROM-TEXT))
200+
201+
(ADDTOVAR TEDIT.CHARBINDINGS (TEDIT-PF "Meta,t" "Meta,T"))
202+
192203
(MOVD? 'PFCOPYBYTES 'PFI.MAYBE.PP.DEFINITION)
193204

194205
(MOVD? 'NILL (FUNCTION TEDIT.SETFUNCTION))
195206

196-
(TEDIT.SETFUNCTION "Meta,T" (FUNCTION PF-TEDIT-FROM-TEXT))
197-
198-
(TEDIT.SETFUNCTION "Meta,t" (FUNCTION PF-TEDIT-FROM-TEXT))
207+
(TEDIT.INSTALL.CHARBINDINGS)
199208
(DECLARE%: DONTEVAL@LOAD DOEVAL@COMPILE DONTCOPY COMPILERVARS
200209

201210
(ADDTOVAR NLAMA )
@@ -205,5 +214,5 @@
205214
(ADDTOVAR LAMA )
206215
)
207216
(DECLARE%: DONTCOPY
208-
(FILEMAP (NIL (1007 10079 (PF-TEDIT 1017 . 8865) (PF-TEDIT-FROM-TEXT 8867 . 10077)))))
217+
(FILEMAP (NIL (1017 10695 (PF-TEDIT 1027 . 8961) (PF-TEDIT-FROM-TEXT 8963 . 10693)))))
209218
STOP

lispusers/TEDIT-PF-SEE.LCOM

42 Bytes
Binary file not shown.

0 commit comments

Comments
 (0)