(enum lface_attribute_index): New member LFACE_FONTSET_INDEX.

diff --git a/src/ChangeLog b/src/ChangeLog
index 333134925017af4b4d507f714b4fda0ef6fae320..b2479bb0713f92c1ef90192d9fd51b3fcaf03dbf 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,22 @@
+2002-08-23  Kenichi Handa  <handa@etl.go.jp>
+
+       * xfaces.c (QCfontset): New variable.
+       (LFACE_FONTSET): New macro.
+       (check_lface_attrs): Check also LFACE_FONTSET_INDEX.
+       (set_lface_from_font_name): Setup LFACE_FONTSET (lface).
+       (Finternal_set_lisp_face_attribute): Handle QCfontset.
+       (Finternal_get_lisp_face_attribute): Likewise.
+       (lface_same_font_attributes_p): Fix checking of LFACE_FONT_INDEX,
+       check also LFACE_FONTSET_INDEX.
+       (face_fontset): Check attrs[LFACE_FONTSET_INDEX], not
+       attrs[LFACE_FONT_INDEX].
+       (syms_of_xfaces): Intern and staticpro QCfontset.
+
+       * dispextern.h (enum lface_attribute_index): New member
+       LFACE_FONTSET_INDEX.
+
+       * fns.c (base64_encode_1): Handle eight-bit chars correctly.
+
 2002-08-21  Kenichi Handa  <handa@etl.go.jp>
 
        * coding.c (coding_set_destination): Fix coding->destination for

diff --git a/src/dispextern.h b/src/dispextern.h
index 9605d55e7bb079e8ecaa76a3bdd35e336f997fe5..bba96ba8171f98dfcaa4e03c54371a76e8077ba3 100644 (file)
--- a/src/dispextern.h
+++ b/src/dispextern.h
@@ -1181,6 +1181,7 @@ enum lface_attribute_index
   LFACE_FONT_INDEX,
   LFACE_INHERIT_INDEX,
   LFACE_AVGWIDTH_INDEX,
+  LFACE_FONTSET_INDEX,
   LFACE_VECTOR_SIZE
 };