From e04a515f63b4d71739ccc07765d7b375c35a855f Mon Sep 17 00:00:00 2001
From: rmkaplan <ron.kaplan@post.harvard.edu>
Date: Mon, 20 Oct 2025 23:49:44 -0700
Subject: [PATCH] EDITFONT bug fix--compatibility with new FONT conventions

---
 lispusers/EDITFONT      |  24 ++++++++++++------------
 lispusers/EDITFONT.LCOM | Bin 10081 -> 10055 bytes
 2 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/lispusers/EDITFONT b/lispusers/EDITFONT
index 517fc5c3a..2bd3628fc 100644
--- a/lispusers/EDITFONT
+++ b/lispusers/EDITFONT
@@ -1,13 +1,13 @@
 (DEFINE-FILE-INFO PACKAGE "INTERLISP" READTABLE "INTERLISP" BASE 10)
 
-
(FILECREATED " 7-Oct-2025 14:56:00" {WMEDLEY}<lispusers>EDITFONT.;40
 26223  
+
(FILECREATED "12-Oct-2025 17:39:29" {WMEDLEY}<lispusers>EDITFONT.;41
 26261  
 
       :EDIT-BY rmk
 
       :CHANGES-TO (RECORDS CHARITEM)
-                  (FNS EDITFONT)
+                  (FNS EF.SAVE)
 
-      :PREVIOUS-DATE " 6-Oct-2025 15:58:41" {WMEDLEY}<lispusers>EDITFONT.;39)
+      :PREVIOUS-DATE " 7-Oct-2025 14:56:00" {WMEDLEY}<lispusers>EDITFONT.;40)
 
 
 (PRETTYCOMPRINT EDITFONTCOMS)
@@ -242,7 +242,8 @@
              (T (LISPERROR "ILLEGAL ARG" BITMAP])
 
 (EF.SAVE

-  [LAMBDA (WINDOW)
                                           (* ; "Edited  2-Sep-2025 23:03 by rmk")


+  [LAMBDA (WINDOW)
                                           (* ; "Edited 12-Oct-2025 17:33 by rmk")


+                                                             (* ; "Edited  2-Sep-2025 23:03 by rmk")


                                                              (* ; "Edited 29-Aug-2025 11:35 by rmk")


                                                              (* ; "Edited  4-Aug-2025 09:22 by rmk")


                                                              (* ; "Edited  2-Aug-2025 08:47 by rmk")

@@ -310,8 +311,7 @@
 
          (* ;; "Can this editing change the descent or ascent?")

 
-         (\SETCHARSETINFO (fetch
 (FONTDESCRIPTOR FONTCHARSETVECTOR) of
 FONT)
-                CHARSET CSINFO])
+         (\SETCHARSETINFO FONT CHARSET CSINFO])
 
 (COPYFONT

   [LAMBDA (FONT)
                                             (* ; "Edited  3-Aug-2025 17:37 by rmk")

@@ -494,10 +494,10 @@
 
 (EF.INIT
)
 (DECLARE%: DONTCOPY
-  (FILEMAP (NIL (1147 16865 (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 . 16157) (
-COPYFONT 16159 . 16434) (READSTRIKEFONTFILE 16436 . 16863)) (16866 26035 (BLANKCHARSETCREATE 16876 . 
-22961) (EDITFONT 22963 . 26033)))))
+  (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)))))
 STOP
diff --git a/lispusers/EDITFONT.LCOM b/lispusers/EDITFONT.LCOM
index ce03d863fb44c97b05397bb5096c7b0793263b09..589ac6dd1bfb40ecb1cc6dc1f2bfdbf9cdb45568 100644
GIT binary patch
delta 331
zcmaFpcieA6xQL;Vu77fgu91O}se+-om9eFjk>$i}Ll;9$1ui8+LnKLKD+41dLqjEn
zq@vX1{M>@foYWMB<c!3;^weTiD+O0Ky<o>MSB1<x1tqsoA0Gun!-@CBEisKSGEmaw
z(s1+iadi%IbqsNJQBcC>h{^hlitL68MrKB4hLgh?O~fGPYbsa;1i6NJ`iBPVx&U=g
zmSnVG<l20jkynV3aq>%HGe)+_3L-U(2Pe-J@nXC?`Gtt#WCc-2AU{bojq&>AlcHK|
zUl}w^jEpA#6zz8~G*bw24e)Vvc2zJjG*s~P3kVHSFflMuaPkcCbqr82wlIP-O%P0D
M1E}cc+hT1309V{uApigX

delta 352
zcmX@^_t0-bxQK$eu77fgu91O}se+-2m8qGPfx*OVLuUg`1ui8NNh2#0Q!67gC55D-
z)a3l!g3O%M6ou4^f}&zoD+N~<&k#3%zYvAYJOw4UP#+%!1@nmy#Fa5kFg8=t<kE2S
z^l^0#a&-)Gb(y?~(Sl9E$jr#dcya`zi2>9kO$DofAlEQY|IlDv7oa)?B?U7ir<z)s
zT3DGFDk*SHtd(Ojw%mN1kynV3WAaO3Ge+LY3L-U(CnnDo@nU>3`Gtt#WFb)x#$A)6
zMbj8BOg<#4#rBRt!^FsP@+Z;$U?XFNAlCpNM`u?B6GICHPrrcB5FpD?!O1hk*D*lB
k*uoOdG(j+p&EcX3CJG?0ySN5B2YCjB_y=u1DApzb0CX*1jQ{`u