3 files changed, 20 insertions, 2 deletions

diff --git a/etc/NEWS b/etc/NEWS
index 98ab09f0654..e21f9920054 100644
--- a/etc/NEWS
+++ b/etc/NEWS
@@ -3175,8 +3175,17 @@ to find a best match for the specified font height, etc.
 
 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 --git a/lisp/ChangeLog b/lisp/ChangeLog
index 974c28379a8..bc0661b7702 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -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 --git a/src/ChangeLog b/src/ChangeLog
index 0cd551b3512..8a400c2ab27 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -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