# HG changeset patch
# User Stefan Monnier <monnier@iro.umontreal.ca>
# Date 1202487629 0
# Node ID aeadaa72f7b1ecc69a68d0cbcfc0d221574e7257
# Parent  b3e6289494fb9b23b7407586818e5abe164a99bc
(free_face_fontset): Use FONTSET_FROM_ID.
(syms_of_fontset): Use ASET.

diff -r b3e6289494fb -r aeadaa72f7b1 src/ChangeLog
--- a/src/ChangeLog	Fri Feb 08 16:18:45 2008 +0000
+++ b/src/ChangeLog	Fri Feb 08 16:20:29 2008 +0000
@@ -1,5 +1,8 @@
 2008-02-08  Stefan Monnier  <monnier@iro.umontreal.ca>
 
+	* 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 -r b3e6289494fb -r aeadaa72f7b1 src/fontset.c
--- a/src/fontset.c	Fri Feb 08 16:18:45 2008 +0000
+++ b/src/fontset.c	Fri Feb 08 16:20:29 2008 +0000
@@ -923,7 +923,7 @@
 {
   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 @@
   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;