*** empty log message ***

diff --git a/etc/NEWS b/etc/NEWS
index 98ab09f06543d2f3a1af8472b6b61f4694d58537..e21f9920054e760008ffb249999229a445264d34 100644 (file)
--- 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 974c28379a891a67870e104d0413d6c4b5fa5f84..bc0661b7702f26261bd3b74b93f1d2195bdbb6c9 100644 (file)
--- 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 0cd551b3512b752b21fb26fb85ed46c805581bef..8a400c2ab273ffcf980f2a10d9d1663f9225f55c 100644 (file)
--- 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