(Fx_list_fonts): Call Flist_fonts with the arg PREFER.

diff --git a/src/ChangeLog b/src/ChangeLog
index 318f378e209e52b950f8a8fd3cb43938e64e2cfd..963665cc0a816b994a4c6558248cc89797507fa6 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,5 +1,12 @@
 2008-06-25  Kenichi Handa  <handa@m17n.org>
 
+       * xfaces.c (Fx_list_fonts): Call Flist_fonts with the arg PREFER.
+
+       * font.c (font_parse_fcname): Remove unused variables.
+       (font_sort_entites): Delete the arg SPEC.  Caller changed.  Fix
+       for the case of ! best_only.
+       (font_delete_unmatched): Check DPI and AVGWIDTH too.
+
        * lisp.h (Fstring_to_unibyte): EXFUN it.
 
        * character.h: (str_to_unibyte): Extern it.

diff --git a/src/xfaces.c b/src/xfaces.c
index fba5a3ba4f7421f6e5a5af4311df1dc47026472b..787891ab2c105b6e9766a87b476bc5990cf4161f 100644 (file)
--- a/src/xfaces.c
+++ b/src/xfaces.c
@@ -1939,7 +1939,7 @@ the WIDTH times as wide as FACE on FRAME.  */)
        Ffont_put (font_spec, QCsize, make_number (size));
        Ffont_put (font_spec, QCavgwidth, make_number (avgwidth));
       }
-    args[0] = Flist_fonts (font_spec, frame, maximum, Qnil);
+    args[0] = Flist_fonts (font_spec, frame, maximum, font_spec);
     for (tail = args[0]; CONSP (tail); tail = XCDR (tail))
       XSETCAR (tail, Ffont_xlfd_name (XCAR (tail), Qnil));
     if (NILP (frame))