diff --git a/library/IMPORTFONTS b/library/IMPORTFONTS
index 72940614..460c1507 100644
--- a/library/IMPORTFONTS
+++ b/library/IMPORTFONTS
@@ -1,12 +1,12 @@
 (DEFINE-FILE-INFO :PACKAGE "INTERLISP" :READTABLE "INTERLISP" :BASE 10 :FORMAT :UTF-8)
 
-
(FILECREATED " 4-May-2026 15:26:51" {MEDLEY}<library>IMPORTFONTS.;115
 58063  
+
(FILECREATED " 5-May-2026 12:21:37" {MEDLEY}<library>IMPORTFONTS.;116
 58246  
 
       :EDIT-BY rmk
 
-      :CHANGES-TO (FNS IMPORT.DISPLAY)
+      :CHANGES-TO (FNS PEF)
 
-      :PREVIOUS-DATE " 4-May-2026 13:49:39" {MEDLEY}<library>IMPORTFONTS.;113)
+      :PREVIOUS-DATE " 4-May-2026 15:26:51" {MEDLEY}<library>IMPORTFONTS.;115)
 
 
 (PRETTYCOMPRINT IMPORTFONTSCOMS)
@@ -693,7 +693,8 @@
 (DEFINEQ
 
 (PEF

-  [LAMBDA (PHASES FONTSPEC CHARSET)
                          (* ; "Edited  4-May-2026 08:27 by rmk")


+  [LAMBDA (PHASES FONTSPEC CHARSET)
                          (* ; "Edited  5-May-2026 12:20 by rmk")


+                                                             (* ; "Edited  4-May-2026 08:27 by rmk")


                                                              (* ; "Edited 12-Apr-2026 19:32 by rmk")


                                                              (* ; "Edited 30-Mar-2026 09:14 by rmk")


                                                              (* ; "Edited 25-Mar-2026 00:11 by rmk")


@@ -729,7 +730,8 @@
                                                (IMPORTFONTS.CONTEXT
 PHASE DIR NIL (fetch
 (FONTSPEC
                                                                                           FSDEVICE)
                                                                                      of
 FONTSPEC))
-                                               (EDITFONT FONTFILE CHARSET NIL NIL TITLETAG))]
+                                               (EDITFONT (MEDLEYFONT.READ.FONT FONTFILE CHARSET)
+                                                      CHARSET NIL NIL TITLETAG))]
                             else
 (PRINTOUT T "Charset " (OCTALSTRING CHARSET)
                                         " of " FONTSPEC " not found in " DIR T)
                                  NIL)
@@ -862,14 +864,14 @@
 
 (FILESLOAD EDITFONT)
 (DECLARE%: DONTCOPY
-  (FILEMAP (NIL (1127 33864 (IMPORTFONTS 1137 . 13084) (FONT.TO.MCCS 13086 . 15336) (
-IMPORTFONTS.FONTSPECS 15338 . 23733) (IMPORTFONTS.CONTEXT 23735 . 27444) (IMPORTFONTS.NOCACHE 27446 . 
-27697) (IMPORTFONTS.DIRECTORY 27699 . 30050) (IMPORTFONTS.CLEAR 30052 . 32598) (IMPORTFONTS.SUBDIR 
-32600 . 33249) (IMPORTFONTS.DIRSIZE 33251 . 33862)) (33865 35088 (IMPORTFONTS.AVAILABLE 33875 . 34484)
- (IMPORTFONTS.EXISTS? 34486 . 35086)) (35089 41872 (FAKEFACE 35099 . 38836) (FAKEFACE.FROMFILE 38838
- . 41079) (FAKEFACE.FROMFONT 41081 . 41870)) (41916 44162 (IMPORT.DISPLAY 41926 . 42464) (
-LEGACYDISPLAYFONT 42466 . 44160)) (44211 46543 (IPF 44221 . 45015) (IPFSIZES 45017 . 46541)) (46544 
-54470 (PEF 46554 . 49729) (AEF 49731 . 50454) (IEF 50456 . 51158) (MEF 51160 . 51860) (CEF 51862 . 
-52566) (FEF 52568 . 53486) (DEF 53488 . 54190) (EFCLOSE 54192 . 54468)) (54471 58018 (SHOWCHARS 54481
- . 56511) (CSSOURCE 56513 . 57226) (FONTDEFFONTS 57228 . 58016)))))
+  (FILEMAP (NIL (1116 33853 (IMPORTFONTS 1126 . 13073) (FONT.TO.MCCS 13075 . 15325) (
+IMPORTFONTS.FONTSPECS 15327 . 23722) (IMPORTFONTS.CONTEXT 23724 . 27433) (IMPORTFONTS.NOCACHE 27435 . 
+27686) (IMPORTFONTS.DIRECTORY 27688 . 30039) (IMPORTFONTS.CLEAR 30041 . 32587) (IMPORTFONTS.SUBDIR 
+32589 . 33238) (IMPORTFONTS.DIRSIZE 33240 . 33851)) (33854 35077 (IMPORTFONTS.AVAILABLE 33864 . 34473)
+ (IMPORTFONTS.EXISTS? 34475 . 35075)) (35078 41861 (FAKEFACE 35088 . 38825) (FAKEFACE.FROMFILE 38827
+ . 41068) (FAKEFACE.FROMFONT 41070 . 41859)) (41905 44151 (IMPORT.DISPLAY 41915 . 42453) (
+LEGACYDISPLAYFONT 42455 . 44149)) (44200 46532 (IPF 44210 . 45004) (IPFSIZES 45006 . 46530)) (46533 
+54653 (PEF 46543 . 49912) (AEF 49914 . 50637) (IEF 50639 . 51341) (MEF 51343 . 52043) (CEF 52045 . 
+52749) (FEF 52751 . 53669) (DEF 53671 . 54373) (EFCLOSE 54375 . 54651)) (54654 58201 (SHOWCHARS 54664
+ . 56694) (CSSOURCE 56696 . 57409) (FONTDEFFONTS 57411 . 58199)))))
 STOP
diff --git a/library/IMPORTFONTS.LCOM b/library/IMPORTFONTS.LCOM
index b20e83be..91ebfacd 100644
Binary files a/library/IMPORTFONTS.LCOM and b/library/IMPORTFONTS.LCOM differ
diff --git a/lispusers/EDITFONT b/lispusers/EDITFONT
index 4669d4ff..01e163c7 100644
--- a/lispusers/EDITFONT
+++ b/lispusers/EDITFONT
@@ -1,14 +1,13 @@
 (DEFINE-FILE-INFO :PACKAGE "INTERLISP" :READTABLE "INTERLISP" :BASE 10)
 
-
(FILECREATED " 5-Apr-2026 11:56:20" {WMEDLEY}<lispusers>EDITFONT.;51
 27416  
+
(FILECREATED " 5-May-2026 12:21:24" {MEDLEY}<lispusers>EDITFONT.;53
 27357  
 
       :EDIT-BY rmk
 
-      :CHANGES-TO (FNS EF.INIT EF.INSPECT)
-                  (VARS EDITFONTCOMS)
+      :CHANGES-TO (FNS EDITFONT)
                   (RECORDS CHARITEM)
 
-      :PREVIOUS-DATE " 4-Apr-2026 18:14:31" {WMEDLEY}<lispusers>EDITFONT.;48)
+      :PREVIOUS-DATE " 5-Apr-2026 11:56:20" {MEDLEY}<lispusers>EDITFONT.;51)
 
 
 (PRETTYCOMPRINT EDITFONTCOMS)
@@ -439,7 +438,8 @@
           (RETURN FONT])
 
 (EDITFONT

-  [LAMBDA (FONT CHARSET ROWMAJOR NCOLUMNS TITLETAG)
          (* ; "Edited  4-Apr-2026 18:14 by rmk")


+  [LAMBDA (FONT CHARSET ROWMAJOR NCOLUMNS TITLETAG)
          (* ; "Edited  5-May-2026 12:19 by rmk")


+                                                             (* ; "Edited  4-Apr-2026 18:14 by rmk")


                                                              (* ; "Edited 30-Mar-2026 12:10 by rmk")


                                                              (* ; "Edited 25-Mar-2026 00:04 by rmk")


                                                              (* ; "Edited 21-Mar-2026 10:43 by rmk")


@@ -451,9 +451,7 @@
                                                              (* mjs "27-Mar-85 14:48")

                                                              (* kbr%: "21-Oct-85 15:35")

                                                              (* kbr%: "21-Oct-85 15:35")

-    (CL:UNLESS (type?
 FONTDESCRIPTOR FONT)
-        (SETQ FONT (OR (MEDLEYFONT.READ.FONT FONT CHARSET T)
-                       (FONTCREATE FONT NIL NIL NIL NIL NIL CHARSET))))
+    (SETQ FONT (FONTCREATE FONT NIL NIL NIL NIL NIL CHARSET))
     (CL:UNLESS (EQ 'DISPLAY (FONTPROP FONT 'DEVICE))
            (ERROR FONT " is not a display font"))
     (SETQ CHARSET (OR (CHARSET.DECODE CHARSET)
@@ -510,10 +508,10 @@
 
 (EF.INIT
)
 (DECLARE%: DONTCOPY
-  (FILEMAP (NIL (1207 17591 (EF.INIT 1217 . 2046) (EF.PROMPT 2048 . 2630) (EF.MESSAGE 2632 . 2844) (
-EF.CLOSEFN 2846 . 3373) (EF.CHARITEMS 3375 . 5304) (EF.BUTTONEVENTFN 5306 . 5718) (EF.WHENSELECTEDFN 
-5720 . 6124) (EF.EDITBM 6126 . 7620) (EF.MIDDLEBUTTONFN 7622 . 7867) (EF.CHANGESIZE 7869 . 9198) (
-EF.DELETE 9200 . 10381) (EF.ENTER 10383 . 11324) (EF.REPLACE 11326 . 12299) (EF.SAVE 12301 . 16544) (
-EF.INSPECT 16546 . 16883) (COPYFONT 16885 . 17160) (READSTRIKEFONTFILE 17162 . 17589)) (17592 27228 (
-BLANKCHARSETCREATE 17602 . 23687) (EDITFONT 23689 . 27226)))))
+  (FILEMAP (NIL (1157 17541 (EF.INIT 1167 . 1996) (EF.PROMPT 1998 . 2580) (EF.MESSAGE 2582 . 2794) (
+EF.CLOSEFN 2796 . 3323) (EF.CHARITEMS 3325 . 5254) (EF.BUTTONEVENTFN 5256 . 5668) (EF.WHENSELECTEDFN 
+5670 . 6074) (EF.EDITBM 6076 . 7570) (EF.MIDDLEBUTTONFN 7572 . 7817) (EF.CHANGESIZE 7819 . 9148) (
+EF.DELETE 9150 . 10331) (EF.ENTER 10333 . 11274) (EF.REPLACE 11276 . 12249) (EF.SAVE 12251 . 16494) (
+EF.INSPECT 16496 . 16833) (COPYFONT 16835 . 17110) (READSTRIKEFONTFILE 17112 . 17539)) (17542 27169 (
+BLANKCHARSETCREATE 17552 . 23637) (EDITFONT 23639 . 27167)))))
 STOP
diff --git a/lispusers/EDITFONT.LCOM b/lispusers/EDITFONT.LCOM
index 61fa400c..cac25bf6 100644
Binary files a/lispusers/EDITFONT.LCOM and b/lispusers/EDITFONT.LCOM differ