# HG changeset patch
# User Kenichi Handa <handa@m17n.org>
# Date 976931063 0
# Node ID 3d5061d0047f903eaa4ce6ada634ee7ed49875db
# Parent  10675adcbf6f191ca327af3fbeb85030e8018f04
*** empty log message ***

diff -r 10675adcbf6f -r 3d5061d0047f etc/NEWS
--- a/etc/NEWS	Sat Dec 16 01:15:05 2000 +0000
+++ b/etc/NEWS	Sat Dec 16 01:44:23 2000 +0000
@@ -3175,8 +3175,17 @@
 
 Setting `face-font-family-alternatives' allows the user to specify
 alternative font families to try if a family specified by a face
-doesn't exist.  Likewise, `face-font-registry-alternatives' allows to
-specify alternative font registry names to try.
+doesn't exist.  
+
+Setting `face-font-registry-alternatives' allows the user to specify
+all alternative font registry names to try for a face speciying a
+registry.
+
+Please note that the iterpretations of the above two variables are
+slightly different.
+
+Setting face-ignored-fonts allows the user to ignore specific fonts.
+
 
 +++
 **** Scalable fonts
diff -r 10675adcbf6f -r 3d5061d0047f lisp/ChangeLog
--- a/lisp/ChangeLog	Sat Dec 16 01:15:05 2000 +0000
+++ b/lisp/ChangeLog	Sat Dec 16 01:44:23 2000 +0000
@@ -1,5 +1,8 @@
 2000-12-16  Kenichi Handa  <handa@etl.go.jp>
 
+	* international/mule-diag.el (mule-diag): Insert information about
+	configure options, multibyte awareness, language env.
+
 	* international/ja-dic-cnv.el (skkdic-get-candidate-list): Fix the
 	regexp to search for candidates.
 
diff -r 10675adcbf6f -r 3d5061d0047f src/ChangeLog
--- a/src/ChangeLog	Sat Dec 16 01:15:05 2000 +0000
+++ b/src/ChangeLog	Sat Dec 16 01:44:23 2000 +0000
@@ -1,3 +1,9 @@
+2000-12-16  Kenichi Handa  <handa@etl.go.jp>
+
+	* xfaces.c (Vface_ignored_fonts): New variable.
+	(x_face_list_fonts): Ignore fonts matching Vface_ignored_fonts.
+	(syms_of_xfaces): Declare Vface_ignored_fonts as a Lisp variable.
+
 2000-12-15  Gerd Moellmann  <gerd@gnu.org>
 
 	* dispnew.c (update_window): Detect pending input every nth line