*** empty log message ***

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index a8429359badc8bfd9863b890651f4605d061a910..44130b804ad6c3f8bdfa39c2ba245044545b116d 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,37 @@
+2000-03-21  Kenichi HANDA  <handa@etl.go.jp>
+
+       * term/x-win.el: Fontsets related initialization is simplified.
+
+       * international/mule-diag.el (describe-font): Don't refer to
+       global-fontset-alist, instead call font-list.
+       (describe-fontset, list-fontsets, mule-diag): Likewise.
+       (print-fontset): Adjusted for the change of fontset
+       implementation.
+
+       * international/fontset.el (x-charset-registries): Variable
+       removed, instead the corresponding data is stored in the default
+       fontset.
+       (register-alternate-fontnames): Function removed.
+       (resolved-ascii-font): Variable removed.
+       (x-compose-font-name): Ignore the second argument REDOCE.
+       (x-complement-fontset-spec): Complement only an ASCII font and
+       element for those charsets than can use that ASCII font.
+       (generate-fontset-menu): Don't refer to global-fontset-alist,
+       instead call fontset-list.
+       (uninstantiated-fontset-alist): Variable removed.
+       (x-style-funcs-alist): Likewise.
+       (fontset-default-styles): Likewise.
+       (x-modify-font-name): Function removed.
+       (create-fontset-from-fontset-spec): Ignore the argument
+       STYLE-VARIANT.
+       (create-fontset-from-ascii-font): Docsting adjusted for the above
+       change.
+       (instantiate-fontset, resolve-fontset-name): Functions removed.
+       (fontset-list): Now implemented by C code.
+       
+       * faces.el (read-face-font): Fix TABLE arg to completing-read.
+       (describe-face): Include `font' attribute in the description.
+
 2000-03-21  Kenichi Handa  <handa@etl.go.jp>
 
        * international/quail.el (quail-set-keyboard-layout): Typo fixed.

diff --git a/src/ChangeLog b/src/ChangeLog
index 41757ac1de80972f51613d6770b8c76090eb213e..1f748139ff24fed7fd8c7631e859b5289f8a458e 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -4,6 +4,10 @@
        characters, not charset.  In addition, they recover fontset
        facilities while utilizing the new font selection mechanism.
 
+       * Makefile.in (fontset.o): Depend on dispextern.h.
+
+       * alloc.c (mark_face_cache): Don't mark face->registry.
+
        * dispextern.h (struct glyph): New member glyph_not_available_p.
        Use 22 bits for face_id.
        (enum lface_attribute_index): Add LFACE_FONT_INDEX.
@@ -58,6 +62,8 @@
        * frame.c (make_frame): Don't allocate f->fontset_data.
        (Fdelete_frame): Don't free f->fontset_data.
 
+       * msdos.c (XMenuActivate): Args to lookup_derived_face changed.
+
        * xdisp.c (charset_at_position): Function removed.
        (init_iterator): Don't set member charset of struct `it'.
        (handle_face_prop, reseat_to_string, set_iterator_to_next,
@@ -115,7 +121,8 @@
        (syms_of_xfaces): Remove code for Qx_charset_registry and
        Vface_default_registry.
 
-       * xterm.c: Include fontset.h after dispextern.h.
+       * xterm.c: Include fontset.h after dispextern.h.  Undo the changes
+       related to PER_CHAR_METRIC done by Gerd on 2000-03-03.
        (x_per_char_metric): Don't try FONT->default_char.  Even if
        pcm->width is zero, glyph bits may exist.
        (x_encode_char): Always initialize char2b->byte1.