From: Kenichi Handa <handa@m17n.org>
Date: Wed, 25 Jun 2008 07:35:49 +0000 (+0000)
Subject: (Fx_list_fonts): Call Flist_fonts with the arg PREFER.
X-Git-Tag: emacs-pretest-23.0.90~4517
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=34e97272759e1c747993708f87b700146f39cd88;p=emacs.git

(Fx_list_fonts): Call Flist_fonts with the arg PREFER.
---

diff --git a/src/ChangeLog b/src/ChangeLog
index 318f378e209..963665cc0a8 100644
--- 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 fba5a3ba4f7..787891ab2c1 100644
--- 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))