# HG changeset patch
# User Kenichi Handa <handa@m17n.org>
# Date 975911222 0
# Node ID d8535b05965fd29a993ecb2fbc2d438066bf486e
# Parent  bb9ec0151423adf3a2f418808fa8fbc00a9df229
*** empty log message ***

diff -r bb9ec0151423 -r d8535b05965f lisp/ChangeLog
--- a/lisp/ChangeLog	Mon Dec 04 06:26:38 2000 +0000
+++ b/lisp/ChangeLog	Mon Dec 04 06:27:02 2000 +0000
@@ -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 -r bb9ec0151423 -r d8535b05965f src/ChangeLog
--- a/src/ChangeLog	Mon Dec 04 06:26:38 2000 +0000
+++ b/src/ChangeLog	Mon Dec 04 06:27:02 2000 +0000
@@ -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.