From ff7a222357ea1064c8019a635954bb0027f5ffe9 Mon Sep 17 00:00:00 2001 From: Stefan Monnier Date: Fri, 8 Feb 2008 16:20:29 +0000 Subject: [PATCH] (free_face_fontset): Use FONTSET_FROM_ID. (syms_of_fontset): Use ASET. --- src/ChangeLog | 3 +++ src/fontset.c | 4 ++-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/src/ChangeLog b/src/ChangeLog index a02c3e631f5..e8335aa0513 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,5 +1,8 @@ 2008-02-08 Stefan Monnier + * fontset.c (free_face_fontset): Use FONTSET_FROM_ID. + (syms_of_fontset): Use ASET. + * fns.c (concat): Move side effect outside of macro call. (hash_clear): Use ASET. diff --git a/src/fontset.c b/src/fontset.c index 36ac055a9d7..e2d59ede8d2 100644 --- a/src/fontset.c +++ b/src/fontset.c @@ -923,7 +923,7 @@ free_face_fontset (f, face) { Lisp_Object fontset; - fontset = AREF (Vfontset_table, face->fontset); + fontset = FONTSET_FROM_ID (face->fontset); xassert (!NILP (fontset) && ! BASE_FONTSET_P (fontset)); xassert (f == XFRAME (FONTSET_FRAME (fontset))); ASET (Vfontset_table, face->fontset, Qnil); @@ -2432,7 +2432,7 @@ syms_of_fontset () FONTSET_ID (Vdefault_fontset) = make_number (0); FONTSET_NAME (Vdefault_fontset) = build_string ("-*-*-*-*-*-*-*-*-*-*-*-*-fontset-default"); - AREF (Vfontset_table, 0) = Vdefault_fontset; + ASET (Vfontset_table, 0, Vdefault_fontset); next_fontset_id = 1; auto_fontset_alist = Qnil; -- 2.39.5