*** empty log message ***

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 2828bb00ed0f678eef0172b024d109519b11a6f3..df5e3fd96bf5ba524bd8c718e2e0ce6f48b72635 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,11 @@
+2000-12-04  Kenichi Handa  <handa@etl.go.jp>
+
+       * faces.el (face-font-registry-alternatives): Add entries for CJK
+       fonts.  Doc-string adjusted for the actual usage of this data.
+
+       * international/fontset.el: Change the font registries for CJK
+       fonts in the default fontset.  Don't append '*' to registries.
+
 2000-12-03  Stefan Monnier  <monnier@cs.yale.edu>
 
        * emacs-lisp/easy-mmode.el (define-derived-mode) 

diff --git a/src/ChangeLog b/src/ChangeLog
index dde8ebc9cdc88e57cfcafe998d50050cca78350c..08d4354eaa790f656d0d89e6945aa20d5cb3c8c7 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,5 +1,13 @@
 2000-12-04  Kenichi Handa  <handa@etl.go.jp>
 
+       * xfaces.c (struct font_name): New member registry_priority.
+       (split_font_name): Initialize the above member to zero.
+       (concat_font_list): New function.
+       (font_list): Include fonts of all alternative registries.
+       (FONT_POINT_SIZE_QUANTUM): New macro.
+       (better_font_p): Ignore point size difference less than
+       FONT_POINT_SIZE_QUANTUM.  Use registry_prioprity as a last resort.
+
        * xterm.c (x_produce_glyphs): If a font for a component of
        a composition is not found, use 1 pixel dot ascent and 0 dot
        descent value to avoid displaying terribly tall empty boxes.