From 9b8b2fa2ffa14af2a6c5752b3af79faeaadf8823 Mon Sep 17 00:00:00 2001 From: rmkaplan Date: Tue, 17 Mar 2026 00:56:53 -0700 Subject: [PATCH] Add DISPLAY sanity check to EDITFONT --- lispusers/EDITFONT | 27 +++++++++++++++------------ lispusers/EDITFONT.LCOM | Bin 10055 -> 10158 bytes 2 files changed, 15 insertions(+), 12 deletions(-) diff --git a/lispusers/EDITFONT b/lispusers/EDITFONT index 2bd3628f..ede826c6 100644 --- a/lispusers/EDITFONT +++ b/lispusers/EDITFONT @@ -1,13 +1,13 @@ -(DEFINE-FILE-INFO PACKAGE "INTERLISP" READTABLE "INTERLISP" BASE 10) +(DEFINE-FILE-INFO :PACKAGE "INTERLISP" :READTABLE "INTERLISP" :BASE 10) -(FILECREATED "12-Oct-2025 17:39:29" {WMEDLEY}EDITFONT.;41 26261 +(FILECREATED "16-Mar-2026 23:19:02" {WMEDLEY}EDITFONT.;42 26474 :EDIT-BY rmk - :CHANGES-TO (RECORDS CHARITEM) - (FNS EF.SAVE) + :CHANGES-TO (FNS EDITFONT) + (RECORDS CHARITEM) - :PREVIOUS-DATE " 7-Oct-2025 14:56:00" {WMEDLEY}EDITFONT.;40) + :PREVIOUS-DATE "12-Oct-2025 17:39:29" {WMEDLEY}EDITFONT.;41) (PRETTYCOMPRINT EDITFONTCOMS) @@ -429,7 +429,8 @@ (RETURN FONT]) (EDITFONT - [LAMBDA (FONT CHARSET ROWMAJOR NCOLUMNS TITLETAG) (* ; "Edited 7-Oct-2025 14:55 by rmk") + [LAMBDA (FONT CHARSET ROWMAJOR NCOLUMNS TITLETAG) (* ; "Edited 16-Mar-2026 23:17 by rmk") + (* ; "Edited 7-Oct-2025 14:55 by rmk") (* ; "Edited 5-Oct-2025 15:06 by rmk") (* ; "Edited 4-Sep-2025 09:27 by rmk") (* ; "Edited 29-Aug-2025 22:34 by rmk") @@ -440,6 +441,8 @@ (* kbr%: "21-Oct-85 15:35") (* kbr%: "21-Oct-85 15:35") (SETQ FONT (FONTCREATE FONT)) + (CL:UNLESS (EQ 'DISPLAY (FONTPROP FONT 'DEVICE)) + (ERROR FONT " is not a display font")) (SETQ CHARSET (OR (CHARSET.DECODE CHARSET) 0)) (LET (CHARITEMS MENU TITLE HEIGHT WIDTH REGION POS WINDOW) @@ -494,10 +497,10 @@ (EF.INIT) (DECLARE%: DONTCOPY - (FILEMAP (NIL (1146 16903 (EF.INIT 1156 . 1790) (EF.PROMPT 1792 . 2374) (EF.MESSAGE 2376 . 2588) ( -EF.CLOSEFN 2590 . 3117) (EF.CHARITEMS 3119 . 4955) (EF.BUTTONEVENTFN 4957 . 5369) (EF.WHENSELECTEDFN -5371 . 5775) (EF.EDITBM 5777 . 7271) (EF.MIDDLEBUTTONFN 7273 . 7518) (EF.CHANGESIZE 7520 . 8849) ( -EF.DELETE 8851 . 10032) (EF.ENTER 10034 . 10975) (EF.REPLACE 10977 . 11950) (EF.SAVE 11952 . 16195) ( -COPYFONT 16197 . 16472) (READSTRIKEFONTFILE 16474 . 16901)) (16904 26073 (BLANKCHARSETCREATE 16914 . -22999) (EDITFONT 23001 . 26071))))) + (FILEMAP (NIL (1147 16904 (EF.INIT 1157 . 1791) (EF.PROMPT 1793 . 2375) (EF.MESSAGE 2377 . 2589) ( +EF.CLOSEFN 2591 . 3118) (EF.CHARITEMS 3120 . 4956) (EF.BUTTONEVENTFN 4958 . 5370) (EF.WHENSELECTEDFN +5372 . 5776) (EF.EDITBM 5778 . 7272) (EF.MIDDLEBUTTONFN 7274 . 7519) (EF.CHANGESIZE 7521 . 8850) ( +EF.DELETE 8852 . 10033) (EF.ENTER 10035 . 10976) (EF.REPLACE 10978 . 11951) (EF.SAVE 11953 . 16196) ( +COPYFONT 16198 . 16473) (READSTRIKEFONTFILE 16475 . 16902)) (16905 26286 (BLANKCHARSETCREATE 16915 . +23000) (EDITFONT 23002 . 26284))))) STOP diff --git a/lispusers/EDITFONT.LCOM b/lispusers/EDITFONT.LCOM index 589ac6dd1bfb40ecb1cc6dc1f2bfdbf9cdb45568..ce1d1ae3e7f37494090415572082de4678146de7 100644 GIT binary patch delta 1093 zcmZuw-A>yu6mIvUX}ujclP2wuF^O(!iJd=^8%SfPwMgP9aVhMsP&RdA6hSXG3Djpm zJjSF+6A!SM@3)`Q4zH`3M$G@`ga$}Y8SY*5vi-fmC7E1{7Fxm>c z91M{uUL>N-4G0PzG8J}`1^8m)`7^hb4o_Otq%Ke^Abw!di%(=mo6s-_z1=j;fRMl> z2JD?2>`y))j}H$BnwtT)C&utc-lla3cf95zict& z1uaPKPqkVHh!C(e0_* zIEP%v%{PGB?mdBarBPGODv6YOpxf>ZP~t!&vnW)69)pZjn3SpzSr>>;KzB$SMqJ5I z$rQ-CTR{~GLFe@TeBs!)3&#f@xBp*i3AR<;aLHAB#_-A+2g?Os6tY0dJ8{)??i}`) zF9rj$_ltjId5LuEiP zODW#r#P$(MMY0Qo_<#>J>?cZ_*5e7o)I@V81?o+61;o7kv9k0Lqt6~a)Th*L&R?Bj zE@1eElMrceirpM>6a$nJFbs6r2LpfNyYta=<|CS>aSKnu_!N#NQy9W%e0qF1{0i?U LN7JjnE8@XFwk8lw delta 1000 zcmZuw&2AGh5Kapm2;x*Ya4BE6s+1rlti3_#CDphGgrN>Hv zN2vN9T>20^1TTZV+tMnkFSft&%zQKR`M3Ndwp$5HxnP}?XRO0TDzTnN@yBS$U~!>X zk?}IOuwJkzQPCh zcKZGJ>--Q0U-r(9=0CPVu(Vr7I}FEXu+mAE;h}T4+qH1GccDEVi%M;)-E5g6V$D>s z1g|af2(jz;D;q}y)Tcf{$P%tPgBi|GPY}kVNDNuoQ4+0Y!D3k?B{W!Y#l~&4Qc>Pf zY$MDIw!`J5>?ArHEc71K>4u&k+P2BHYBz8Gu0(HNer`4z&pteF=(XRt8E(v07H$t? znXp1kxk%&`j%y>IsQQ){GKWJQL`gDcVgiTIB`XbrWu)&fBRz_`BU4b1V#w4$e#&LZ zRhvrz>bjWnM2&cQ%Yr%q23(D!yuv{p_xji7+7|6$#Q1Qe?q5=J`?5BGlIx$FuNI^# z!;r3uAVCjCQtv?e9%3otNNJ%^$XG>LsR}NJAbK3B6e^8krevh#7{v1{s1BlgW9;>X zy7w0vn5o>&sRUU#)znI+x{01*!r)b}>o#bWIF4sr1{0;EU^`4_6>uCIONi~?1p*D6 zDh6oZ{;!D=)OKMsWSA+g^yeTRS-=zlqO+8IS06~AkulF^=m*f>Et+J?bZ5k}L}xY; zvqBd(&J}vZP@9gJD4Eu>7P8^y;qvJd)rKU)Cb)c K3pevEzWNU;9{B?R