From 67a3e558f6469eb0596247d8d366ce3452617779 Mon Sep 17 00:00:00 2001 From: rmkaplan Date: Sun, 20 Apr 2025 22:52:06 -0700 Subject: [PATCH] TEDIT-PF-SEE: Meta-T defaults to showing the definition in the current file --- lispusers/TEDIT-PF-SEE | 47 +++++++++++++++++++++--------------- lispusers/TEDIT-PF-SEE.LCOM | Bin 5382 -> 5424 bytes 2 files changed, 28 insertions(+), 19 deletions(-) diff --git a/lispusers/TEDIT-PF-SEE b/lispusers/TEDIT-PF-SEE index 6c19e0bc..4d1845a9 100644 --- a/lispusers/TEDIT-PF-SEE +++ b/lispusers/TEDIT-PF-SEE @@ -1,12 +1,12 @@ (DEFINE-FILE-INFO PACKAGE "INTERLISP" READTABLE "INTERLISP" BASE 10) -(FILECREATED "26-Mar-2025 10:09:16" {WMEDLEY}TEDIT-PF-SEE.;137 11103 +(FILECREATED "14-Apr-2025 22:00:54" {WMEDLEY}TEDIT-PF-SEE.;141 11757 :EDIT-BY rmk - :CHANGES-TO (FNS PF-TEDIT) + :CHANGES-TO (FNS PF-TEDIT PF-TEDIT-FROM-TEXT) - :PREVIOUS-DATE "18-Feb-2025 23:39:40" {WMEDLEY}TEDIT-PF-SEE.;136) + :PREVIOUS-DATE " 7-Apr-2025 23:03:54" {WMEDLEY}TEDIT-PF-SEE.;140) (PRETTYCOMPRINT TEDIT-PF-SEECOMS) @@ -16,17 +16,19 @@ (COMMANDS ts tf) (FILES (SYSLOAD) REGIONMANAGER VERSIONDEFS) + (ALISTS (TEDIT.CHARACTIONS TEDIT-PF) + (TEDIT.CHARBINDINGS TEDIT-PF)) (P (MOVD? 'PFCOPYBYTES 'PFI.MAYBE.PP.DEFINITION) (MOVD? 'NILL (FUNCTION TEDIT.SETFUNCTION)) - (TEDIT.SETFUNCTION "Meta,T" (FUNCTION PF-TEDIT-FROM-TEXT)) - (TEDIT.SETFUNCTION "Meta,t" (FUNCTION PF-TEDIT-FROM-TEXT))) + (TEDIT.INSTALL.CHARBINDINGS)) (DECLARE%: DONTEVAL@LOAD DOEVAL@COMPILE DONTCOPY COMPILERVARS (ADDVARS (NLAMA) (NLAML) (LAMA]) (DEFINEQ (PF-TEDIT - [LAMBDA (FN IFILES VERSION REPRINT) (* ; "Edited 26-Mar-2025 10:08 by rmk") + [LAMBDA (FN IFILES VERSION REPRINT) (* ; "Edited 14-Apr-2025 22:00 by rmk") + (* ; "Edited 26-Mar-2025 10:08 by rmk") (* ; "Edited 18-Feb-2025 23:39 by rmk") (* ; "Edited 6-Dec-2024 19:15 by rmk") (* ; "Edited 27-Aug-2024 13:03 by rmk") @@ -67,8 +69,8 @@ (SETQ REPRINT T) [SETQ IFILES (LDIFFERENCE IFILES '(t T]) (CL:UNLESS IFILES - (SETQ IFILES (APPEND (WHEREIS FN 'FNS T) - (WHEREIS FN 'FUNCTIONS T)))) + (SETQ IFILES (WHEREIS FN '(FNS FUNCTIONS) + T))) (IF IFILES THEN (* ; "skip compiled files") @@ -151,24 +153,29 @@ ELSE (PRINTOUT T FN " has no function definition" T]) (PF-TEDIT-FROM-TEXT - [LAMBDA (TSTREAM TEXTOBJ SEL) (* ; "Edited 5-Dec-2024 22:20 by rmk") + [LAMBDA (TSTREAM TEXTOBJ SEL) (* ; "Edited 14-Apr-2025 21:59 by rmk") + (* ; "Edited 7-Apr-2025 23:03 by rmk") + (* ; "Edited 5-Dec-2024 22:20 by rmk") (* ; "Edited 26-Aug-2024 23:13 by rmk") - (* ;; "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.") + (* ;; "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.") (SETQ TSTREAM (TEXTSTREAM TSTREAM)) (CL:UNLESS SEL (SETQ SEL (TEDIT.GETSEL TSTREAM))) - (LET [[FILENAME (OR (TEXTPROP TSTREAM 'FILENAME) + (LET ([THISFILE (OR (TEXTPROP TSTREAM 'FILENAME) (AND (\TEDIT.PRIMARYPANE TSTREAM) (CADR (WINDOWPROP (\TEDIT.PRIMARYPANE TSTREAM TSTREAM) 'TF] - (FN (MKATOM (TEDIT.SEL.AS.STRING TSTREAM SEL] + (FN (MKATOM (TEDIT.SEL.AS.STRING TSTREAM SEL))) + ALLFILES) (if (EQ 0 (NCHARS FN)) then (TEDIT.PROMPTPRINT TSTREAM "Please select a function to display" T) - elseif FILENAME - then [PF-TEDIT FN (CAR (MEMB (FILENAMEFIELD FILENAME) - (WHEREIS FN NIL T] + elseif (SETQ ALLFILES (WHEREIS FN '(FNS FUNCTIONS) + T)) + then (PF-TEDIT FN (CAR (OR (MEMB (FILENAMEFIELD THISFILE) + ALLFILES) + ALLFILES))) else (TEDIT.PROMPTPRINT TSTREAM (CONCAT FN " not found") T]) ) @@ -189,13 +196,15 @@ (FILESLOAD (SYSLOAD) REGIONMANAGER VERSIONDEFS) +(ADDTOVAR TEDIT.CHARACTIONS (TEDIT-PF PF-TEDIT-FROM-TEXT)) + +(ADDTOVAR TEDIT.CHARBINDINGS (TEDIT-PF "Meta,t" "Meta,T")) + (MOVD? 'PFCOPYBYTES 'PFI.MAYBE.PP.DEFINITION) (MOVD? 'NILL (FUNCTION TEDIT.SETFUNCTION)) -(TEDIT.SETFUNCTION "Meta,T" (FUNCTION PF-TEDIT-FROM-TEXT)) - -(TEDIT.SETFUNCTION "Meta,t" (FUNCTION PF-TEDIT-FROM-TEXT)) +(TEDIT.INSTALL.CHARBINDINGS) (DECLARE%: DONTEVAL@LOAD DOEVAL@COMPILE DONTCOPY COMPILERVARS (ADDTOVAR NLAMA ) @@ -205,5 +214,5 @@ (ADDTOVAR LAMA ) ) (DECLARE%: DONTCOPY - (FILEMAP (NIL (1007 10079 (PF-TEDIT 1017 . 8865) (PF-TEDIT-FROM-TEXT 8867 . 10077))))) + (FILEMAP (NIL (1017 10695 (PF-TEDIT 1027 . 8961) (PF-TEDIT-FROM-TEXT 8963 . 10693))))) STOP diff --git a/lispusers/TEDIT-PF-SEE.LCOM b/lispusers/TEDIT-PF-SEE.LCOM index 94a0d8d0caa63b51df39c5f035207a96e9106331..5a4511116116dee21dc6fcfebc93ba17bc436321 100644 GIT binary patch delta 1331 zcmZuw&yU+g6vkOq+BNO&5~V_|TKeP`krWbn#&+yjLg0Sd+filu0m zwyAn!#f39v4oHZ<0Vu0p5H|$<6S#Ba#DPD6=OoT%tM%p0eDBA6@4e4o-~9RJH{%9z z+tC+~+tj8WP#W5H=(*1ydY4_&0@EVol-KKqE`9#%HT`O{ejoM^z)D7G3d>QQPRD}X zoyp#=31_AIR?BQAJZ1fYMT*53bOrOVIxz8B^N+veFwwqr~M z3;ZQ^PG~#G-2zj;Fs|2J`}i-TXVkjA?!3?%5yA`#tY zh2)t)jKX-p3dSW6pTZo^fjF-I`@A^v%jzlXh)i{oY$RfAEr2lE%8Ifxobgg;6ddY9 z$VEOvC#4X^ykLD*zC>|SirrCCp=^dgecV(61P6d16H_*nzy!sG8}m>bpYA*X{l|q% zcf2lGs7cpB3kQc2cyRdiU>6Qiz2MrXKn!yNL>}yazK32y1862fLNXFl8nR`gBq=l} zpjz5m|L7`(C{4>2C1BT(2sAdR0hb8sN9#9g->>NJ)<5ys6lTlm-t{Bb=xfOFIR5sw>GZUJfiK5#)qy4{Y>;Dh2urt%qNE|o!QRtXL)^RwqNZ> zf3@-Zb=O`V0XB$gdaXe%H(w2+Qh5@ZQ_*$$gQ$pR{o@W$hV49QEjzbRKwR9CCth^t z&@}b6MreS(*LcS^XSF0#)i7I&8eB+)W1K!z)%v#nz8Pmi^|Smgn8#lIALB+8$12;7 xirG7-c+IFHG5w!CBf%Q(O?Ez*So4FjTKY=k+2ym?v`oQM^MB6>N-+Qc delta 1301 zcma)4OK%fb6t108B~z57$fZ&da5Um!N7%iOd3c5mj^|D@>iEuR<~nW#n?P)0S~(I- z!~%)zx-DT=NU&&s0jhUZ)eQ@NMAao5R{aB&dd9|%Q?)9ym~-@f=iKw1$IFfHH=gt= z%&K>G?$;S%CQ#xM$EDWMx8~>Eu7Rd6vIWHp_Lqw{ha=GaZWzL1K%>#nVRt9%@BV8h zqk2uN`avk#iD)U|!HMVR#UEW><~C4D3D2`q^-2xgI1$@H)J^Li=7CO|b-#ams+n<@ zJFY>F9$jAImNx#YV%Hwlm{l?u7@Ed+y{1<&~ z4BGwDp-D|pB8ig#OyU4qNx^WMGp}jSXroDHpf#thIcCf;Z0OyK2A|V(PSY92n;Z_? zq1z6lQ~eL#MdfScv~G{4z3XUz{wye82^=$J-(1$*t!l~1oiRr{~l>>siD>X{8q^CGF*QTz>zH_yB+