Skip to content

Commit c3a833e

Browse files
authored
EDITFONT minor update: apply CHARSET.DECODE to charset argument (#2262)
1 parent fc26d21 commit c3a833e

File tree

2 files changed

+13
-15
lines changed

2 files changed

+13
-15
lines changed

lispusers/EDITFONT

Lines changed: 13 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,12 @@
11
(DEFINE-FILE-INFO PACKAGE "INTERLISP" READTABLE "INTERLISP" BASE 10)
22

3-
(FILECREATED " 4-Aug-2025 13:34:06" {WMEDLEY}<lispusers>EDITFONT.;26 23614
3+
(FILECREATED "17-Aug-2025 12:11:44" {WMEDLEY}<lispusers>EDITFONT.;27 23463
44

55
:EDIT-BY rmk
66

7-
:CHANGES-TO (FNS READSTRIKEFONTFILE BLANKCHARSETCREATE EF.INIT EF.DELETE BLANKFONTCREATE
8-
EF.DELETECHAR EF.SAVE EDITFONT EF.CHARITEMS EF.EDITBM EF.BLANK COPYFONT
9-
EF.CHANGESIZE EF.ENTER EF.REPLACE)
10-
(VARS EDITFONTCOMS)
11-
(RECORDS CHARITEM)
7+
:CHANGES-TO (FNS EDITFONT)
128

13-
:PREVIOUS-DATE " 2-Aug-2025 10:11:50" {WMEDLEY}<lispusers>EDITFONT.;14)
9+
:PREVIOUS-DATE " 4-Aug-2025 13:34:06" {WMEDLEY}<lispusers>EDITFONT.;26)
1410

1511

1612
(PRETTYCOMPRINT EDITFONTCOMS)
@@ -412,13 +408,15 @@
412408
(RETURN FONT])
413409

414410
(EDITFONT
415-
[LAMBDA (FONT CHARSET) (* ; "Edited 3-Aug-2025 23:25 by rmk")
411+
[LAMBDA (FONT CHARSET) (* ; "Edited 17-Aug-2025 12:03 by rmk")
412+
(* ; "Edited 3-Aug-2025 23:25 by rmk")
416413
(* ; "Edited 2-Aug-2025 10:11 by rmk")
417414
(* mjs "27-Mar-85 14:48")
418415
(* kbr%: "21-Oct-85 15:35")
419416
(* kbr%: "21-Oct-85 15:35")
420417
(SETQ FONT (FONTCREATE FONT))
421-
(CL:UNLESS CHARSET (SETQ CHARSET 0))
418+
(SETQ CHARSET (OR (CHARSET.DECODE CHARSET)
419+
0))
422420
(LET (CHARITEMS MENU TITLE HEIGHT WIDTH REGION POS WINDOW)
423421
(SETQ CHARITEMS (EF.CHARITEMS FONT CHARSET))
424422
(SETQ MENU (create MENU
@@ -463,10 +461,10 @@
463461

464462
(EF.INIT)
465463
(DECLARE%: DONTCOPY
466-
(FILEMAP (NIL (1402 15256 (EF.INIT 1412 . 2046) (EF.PROMPT 2048 . 2630) (EF.MESSAGE 2632 . 2844) (
467-
EF.CLOSEFN 2846 . 3373) (EF.CHARITEMS 3375 . 4033) (EF.BUTTONEVENTFN 4035 . 4447) (EF.WHENSELECTEDFN
468-
4449 . 4853) (EF.EDITBM 4855 . 6024) (EF.MIDDLEBUTTONFN 6026 . 6271) (EF.CHANGESIZE 6273 . 7602) (
469-
EF.DELETE 7604 . 8679) (EF.ENTER 8681 . 9622) (EF.REPLACE 9624 . 10597) (EF.SAVE 10599 . 14548) (
470-
COPYFONT 14550 . 14825) (READSTRIKEFONTFILE 14827 . 15254)) (15257 23426 (BLANKCHARSETCREATE 15267 .
471-
21244) (EDITFONT 21246 . 23424)))))
464+
(FILEMAP (NIL (1110 14964 (EF.INIT 1120 . 1754) (EF.PROMPT 1756 . 2338) (EF.MESSAGE 2340 . 2552) (
465+
EF.CLOSEFN 2554 . 3081) (EF.CHARITEMS 3083 . 3741) (EF.BUTTONEVENTFN 3743 . 4155) (EF.WHENSELECTEDFN
466+
4157 . 4561) (EF.EDITBM 4563 . 5732) (EF.MIDDLEBUTTONFN 5734 . 5979) (EF.CHANGESIZE 5981 . 7310) (
467+
EF.DELETE 7312 . 8387) (EF.ENTER 8389 . 9330) (EF.REPLACE 9332 . 10305) (EF.SAVE 10307 . 14256) (
468+
COPYFONT 14258 . 14533) (READSTRIKEFONTFILE 14535 . 14962)) (14965 23275 (BLANKCHARSETCREATE 14975 .
469+
20952) (EDITFONT 20954 . 23273)))))
472470
STOP

lispusers/EDITFONT.LCOM

-198 Bytes
Binary file not shown.

0 commit comments

Comments
 (0)