From c3a833e5d0a727d091fd4dbb90a559beaf51ff47 Mon Sep 17 00:00:00 2001
From: rmkaplan <69548581+rmkaplan@users.noreply.github.com>
Date: Tue, 19 Aug 2025 15:16:38 -0700
Subject: [PATCH] EDITFONT minor update:  apply CHARSET.DECODE to charset
 argument (#2262)

---
 lispusers/EDITFONT      |  28 +++++++++++++---------------
 lispusers/EDITFONT.LCOM | Bin 9345 -> 9147 bytes
 2 files changed, 13 insertions(+), 15 deletions(-)

diff --git a/lispusers/EDITFONT b/lispusers/EDITFONT
index 5ef88a7d..e1790da8 100644
--- a/lispusers/EDITFONT
+++ b/lispusers/EDITFONT
@@ -1,16 +1,12 @@
 (DEFINE-FILE-INFO PACKAGE "INTERLISP" READTABLE "INTERLISP" BASE 10)
 
-
(FILECREATED " 4-Aug-2025 13:34:06" {WMEDLEY}<lispusers>EDITFONT.;26
 23614  
+
(FILECREATED "17-Aug-2025 12:11:44" {WMEDLEY}<lispusers>EDITFONT.;27
 23463  
 
       :EDIT-BY rmk
 
-      :CHANGES-TO (FNS READSTRIKEFONTFILE BLANKCHARSETCREATE EF.INIT EF.DELETE BLANKFONTCREATE 
-                       EF.DELETECHAR EF.SAVE EDITFONT EF.CHARITEMS EF.EDITBM EF.BLANK COPYFONT 
-                       EF.CHANGESIZE EF.ENTER EF.REPLACE)
-                  (VARS EDITFONTCOMS)
-                  (RECORDS CHARITEM)
+      :CHANGES-TO (FNS EDITFONT)
 
-      :PREVIOUS-DATE " 2-Aug-2025 10:11:50" {WMEDLEY}<lispusers>EDITFONT.;14)
+      :PREVIOUS-DATE " 4-Aug-2025 13:34:06" {WMEDLEY}<lispusers>EDITFONT.;26)
 
 
 (PRETTYCOMPRINT EDITFONTCOMS)
@@ -412,13 +408,15 @@
           (RETURN FONT])
 
 (EDITFONT

-  [LAMBDA (FONT CHARSET)
                                     (* ; "Edited  3-Aug-2025 23:25 by rmk")


+  [LAMBDA (FONT CHARSET)
                                     (* ; "Edited 17-Aug-2025 12:03 by rmk")


+                                                             (* ; "Edited  3-Aug-2025 23:25 by rmk")


                                                              (* ; "Edited  2-Aug-2025 10:11 by rmk")

                                                              (* mjs "27-Mar-85 14:48")

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

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

     (SETQ FONT (FONTCREATE FONT))
-    (CL:UNLESS CHARSET (SETQ CHARSET 0))
+    (SETQ CHARSET (OR (CHARSET.DECODE CHARSET)
+                      0))
     (LET (CHARITEMS MENU TITLE HEIGHT WIDTH REGION POS WINDOW)
          (SETQ CHARITEMS (EF.CHARITEMS
 FONT CHARSET))
          (SETQ MENU (create
 MENU
@@ -463,10 +461,10 @@
 
 (EF.INIT
)
 (DECLARE%: DONTCOPY
-  (FILEMAP (NIL (1402 15256 (EF.INIT 1412 . 2046) (EF.PROMPT 2048 . 2630) (EF.MESSAGE 2632 . 2844) (
-EF.CLOSEFN 2846 . 3373) (EF.CHARITEMS 3375 . 4033) (EF.BUTTONEVENTFN 4035 . 4447) (EF.WHENSELECTEDFN 
-4449 . 4853) (EF.EDITBM 4855 . 6024) (EF.MIDDLEBUTTONFN 6026 . 6271) (EF.CHANGESIZE 6273 . 7602) (
-EF.DELETE 7604 . 8679) (EF.ENTER 8681 . 9622) (EF.REPLACE 9624 . 10597) (EF.SAVE 10599 . 14548) (
-COPYFONT 14550 . 14825) (READSTRIKEFONTFILE 14827 . 15254)) (15257 23426 (BLANKCHARSETCREATE 15267 . 
-21244) (EDITFONT 21246 . 23424)))))
+  (FILEMAP (NIL (1110 14964 (EF.INIT 1120 . 1754) (EF.PROMPT 1756 . 2338) (EF.MESSAGE 2340 . 2552) (
+EF.CLOSEFN 2554 . 3081) (EF.CHARITEMS 3083 . 3741) (EF.BUTTONEVENTFN 3743 . 4155) (EF.WHENSELECTEDFN 
+4157 . 4561) (EF.EDITBM 4563 . 5732) (EF.MIDDLEBUTTONFN 5734 . 5979) (EF.CHANGESIZE 5981 . 7310) (
+EF.DELETE 7312 . 8387) (EF.ENTER 8389 . 9330) (EF.REPLACE 9332 . 10305) (EF.SAVE 10307 . 14256) (
+COPYFONT 14258 . 14533) (READSTRIKEFONTFILE 14535 . 14962)) (14965 23275 (BLANKCHARSETCREATE 14975 . 
+20952) (EDITFONT 20954 . 23273)))))
 STOP
diff --git a/lispusers/EDITFONT.LCOM b/lispusers/EDITFONT.LCOM
index f2eb2ee5c102407e6a6d6e368fc8d42a966b18e4..4b2703888190771d1acd70e46aef5acded05d30f 100644
GIT binary patch
delta 757
zcmZuv&2G~`5Kh7YQBH^+dO%`gKx&YZde;9wv9Z_js_~EPO-;F=ghr_RRs|#^4iRqv
z$}8{$RGfG!-hi>)(x}vzo%zP!H{a~eSNVJLt=dLs$UnUtGM!m~%t!Q1^ZRRDIRn_z
z(7G(@o^QCm$uwA;E?>NVdvg3{c?8SPC#N4C`5;26qAXQ#{0_8eHl4yIcQhJla5Vo&
zgzH2t)COC-k(`R45L}56wCjC+>ECpK8K!Nl=Uv#jXgUBtFT{b&X5}y>{`x`JJ^Rs<
z_jdU0PN(<eR)@Ythd1Z18?P3<pZBr5av;e<QKXej!>j@W5%QU8v%JW1V4ej$3=@&g
zfVtMys$*P5?Ee%@7uuOBV9bMwP~+@ro|RI`d6p7}P{~lmGCFs`(1x*83C|lG7`X~!
z5$x~PHuhw~CjyvmLM-GYR{wbDx#zsL0O%R(JN@mI4LJ|?9|O8%j-mk2^hh$uQlwCa
z`q`Rsk=YvwT9*lPK}4e<=7m%uDFF=<;6*9aC=>x*BD6oZqtaU%x?MBIGxc0$sW=d+
zic&Ci1cEjY=G0aiC1AGGbOdHu4S3Ouw0R(CI}u9xi~=OnJdx8waP{?{{@sTT-O;q5
bA(C8y&Fa=wEYecYM$tOet<AGt?XdS3NngG0

delta 961
zcmZuw$&S-N5KY1&5spZ3L8C_yQi3#$yS-!)2OM`LZpEAIPRwu&j7EbP7!5+=fE4is
zFv=(J2|04$$Y<~?blU^7`r@vt_o`l1SO1)TmEX(tN%Q{6;ZE%J(C&b5`=9o=xy4;D
zcf^MyyWhd`c<=Rx!=r<DdvCD!`RMrLlM!<AMWJ#zqe+^miHryb@6nmeqX^(9e;z!(
zn#*xIy>{1N15H;X*58_g+u*jxoORj6>YAkE$WLZL=;sBgngyCXlZjO3FDN2Ks6a-?
z8KRCDqQMpZg3u-*l|dPgiAY6pVGI)($5`oOl?p+c?Vdv>Q!3;us-TIYDrHVt<OkG4
zccI0dB@fcL(9WEKG#3T_)#+iB<+PCLyx11HcU+vcHDYXZ%e6XauUT`e#hlIWrhIts
z`Q1jN_2N!Lf6Ipd<L$EbYt!9g%@s$S3d)mGCL%3iTOP8xs;w+fGw`7WUx=8JIrzZ3
z9Q6j5J?@nZj*WVtB{+95B{fc8W@#anT%`#(^H55mLOD5A!5PC?s@TseKe$#EgcQtn
zjEo%_`%?lN4iS=^hU!0$4ee829RM2)t|1N>GC!C-1?#W0SbYq@97iLAG+|)23v+2z
z`;4=52D8o#ZeP6rnp8Kc*VDF`iI3+>r3o!aFSl-W=;4BA1>QG>tGxvGc$FXAwJK-5
zS<KdD^^Sn)NmUEPEM3iyWweXF3qccq9w{@MkRqY$czRw@t{aFm1-Ea6lp!UBUh_b|
Qmr4n~+`JKQ_8+O%U&9UeV*mgE