ACFONT: Get the right priority on DISPLAYCHARSETFNS if AC is in the loadup

sources/ACFONT

@@ -1,12 +1,12 @@
 (DEFINE-FILE-INFO :PACKAGE "INTERLISP" :READTABLE "INTERLISP" :BASE 10 :FORMAT :UTF-8)
 
-
(FILECREATED " 5-Apr-2026 17:56:58" {WMEDLEY}<sources>ACFONT.;7
 42904  
+
(FILECREATED "13-Apr-2026 09:00:05" {WMEDLEY}<sources>ACFONT.;10
 43480  
 
       :EDIT-BY rmk
 
       :CHANGES-TO (VARS ACFONTCOMS)
 
-      :PREVIOUS-DATE " 5-Apr-2026 13:44:04" {WMEDLEY}<sources>ACFONT.;6)
+      :PREVIOUS-DATE "13-Apr-2026 08:59:25" {WMEDLEY}<sources>ACFONT.;9)
 
 
 (PRETTYCOMPRINT ACFONTCOMS)
@@ -19,10 +19,15 @@
         (FNS ACFONT.FILEP ACFONT.GETCHARSET \READACFONTBOXES \READACFONTFILE \ACCHARIMAGELIST 
              \ACCHARWIDTHLIST \GETFBB \ACCHARPOSLIST \ACROTATECHAR \FACECODE \FAMILYCODE)
         (PROP FILETYPE ACFONT)
-        (ADDVARS (DISPLAYCHARSETFNS (AC ACFONT.FILEP ACFONT.GETCHARSET)))
+        [P (CL:UNLESS (ASSOC 'AC DISPLAYCHARSETFNS)
+               (RPAQ DISPLAYCHARSETFNS
 (NCONC1 DISPLAYCHARSETFNS '(AC ACFONT.FILEP ACFONT.GETCHARSET)
+                                              )))]
         (COMS                                                (* ; "STRIKE format files")

               (FNS STRIKEFONT.FILEP STRIKEFONT.GETCHARSET WRITESTRIKEFONTFILE STRIKECSINFO)
-              (ADDVARS (DISPLAYCHARSETFNS (STRIKE STRIKEFONT.FILEP STRIKEFONT.GETCHARSET])
+              (P (CL:UNLESS (ASSOC 'STRIKE DISPLAYCHARSETFNS)
+                     (RPAQ DISPLAYCHARSETFNS
 (NCONC1 DISPLAYCHARSETFNS '(STRIKE STRIKEFONT.FILEP 
+                                                                               STRIKEFONT.GETCHARSET)
+                                                    )))])
 
 
 
@@ -440,7 +445,8 @@
 
 (PUTPROPS ACFONT
 FILETYPE
 CL:COMPILE-FILE)
 
-(ADDTOVAR DISPLAYCHARSETFNS
 (AC ACFONT.FILEP ACFONT.GETCHARSET))
+(CL:UNLESS (ASSOC 'AC DISPLAYCHARSETFNS)
+    (RPAQ DISPLAYCHARSETFNS
 (NCONC1 DISPLAYCHARSETFNS '(AC ACFONT.FILEP ACFONT.GETCHARSET))))
 
 
 
@@ -685,12 +691,14 @@
                          CHARSETDESCENT ← (fetch
 (CHARSETINFO CHARSETDESCENT) of
 CSINFO])
 )
 
-(ADDTOVAR DISPLAYCHARSETFNS
 (STRIKE STRIKEFONT.FILEP STRIKEFONT.GETCHARSET))
+(CL:UNLESS (ASSOC 'STRIKE DISPLAYCHARSETFNS)
+    (RPAQ DISPLAYCHARSETFNS
 (NCONC1 DISPLAYCHARSETFNS '(STRIKE STRIKEFONT.FILEP STRIKEFONT.GETCHARSET
+                                                              ))))
 (DECLARE%: DONTCOPY
-  (FILEMAP (NIL (2696 27643 (ACFONT.FILEP 2706 . 3590) (ACFONT.GETCHARSET 3592 . 4202) (\READACFONTBOXES
- 4204 . 6428) (\READACFONTFILE 6430 . 19279) (\ACCHARIMAGELIST 19281 . 19618) (\ACCHARWIDTHLIST 19620
- . 20880) (\GETFBB 20882 . 24160) (\ACCHARPOSLIST 24162 . 25208) (\ACROTATECHAR 25210 . 25760) (
-\FACECODE 25762 . 26352) (\FAMILYCODE 26354 . 27641)) (27802 42799 (STRIKEFONT.FILEP 27812 . 28700) (
-STRIKEFONT.GETCHARSET 28702 . 34292) (WRITESTRIKEFONTFILE 34294 . 39203) (STRIKECSINFO 39205 . 42797))
+  (FILEMAP (NIL (3065 28012 (ACFONT.FILEP 3075 . 3959) (ACFONT.GETCHARSET 3961 . 4571) (\READACFONTBOXES
+ 4573 . 6797) (\READACFONTFILE 6799 . 19648) (\ACCHARIMAGELIST 19650 . 19987) (\ACCHARWIDTHLIST 19989
+ . 21249) (\GETFBB 21251 . 24529) (\ACCHARPOSLIST 24531 . 25577) (\ACROTATECHAR 25579 . 26129) (
+\FACECODE 26131 . 26721) (\FAMILYCODE 26723 . 28010)) (28241 43238 (STRIKEFONT.FILEP 28251 . 29139) (
+STRIKEFONT.GETCHARSET 29141 . 34731) (WRITESTRIKEFONTFILE 34733 . 39642) (STRIKECSINFO 39644 . 43236))
 )))
 STOP