# HG changeset patch
# User Andrew Choi <akochoi@shaw.ca>
# Date 1051245145 0
# Node ID cb5f0a5d5b36ad51bb41502f95e597505e8a4f97
# Parent  ad311d8949c48308464435258b43b40821abd5c4
* macterm.c (x_list_fonts): Return all fonts that match if maxnames = -1.

diff -r ad311d8949c4 -r cb5f0a5d5b36 src/ChangeLog
--- a/src/ChangeLog	Fri Apr 25 02:00:17 2003 +0000
+++ b/src/ChangeLog	Fri Apr 25 04:32:25 2003 +0000
@@ -1,3 +1,8 @@
+2003-04-24  Andrew Choi  <akochoi@shaw.ca>
+
+	* macterm.c (x_list_fonts): Return all fonts that match if
+	maxnames = -1.
+
 2003-04-25  Kenichi Handa  <handa@m17n.org>
 
 	* syntax.c (skip_chars): Fix previous change.
diff -r ad311d8949c4 -r cb5f0a5d5b36 src/macterm.c
--- a/src/macterm.c	Fri Apr 25 02:00:17 2003 +0000
+++ b/src/macterm.c	Fri Apr 25 04:32:25 2003 +0000
@@ -5825,7 +5825,8 @@
 /* Return a list of at most MAXNAMES font specs matching the one in
    PATTERN.  Cache matching fonts for patterns in
    dpyinfo->name_list_element to avoid looking them up again by
-   calling mac_font_pattern_match (slow).  */
+   calling mac_font_pattern_match (slow).  Return as many matching
+   fonts as possible if MAXNAMES = -1.  */
 
 Lisp_Object
 x_list_fonts (struct frame *f,
@@ -5868,7 +5869,7 @@
           newlist = Fcons (build_string (font_name_table[i]), newlist);
 
           n_fonts++;
-          if (n_fonts >= maxnames)
+          if (maxnames > 0 && n_fonts >= maxnames)
             break;
         }
     }