* macterm.c (x_list_fonts): Return all fonts that match if maxnames = -1.

diff --git a/src/ChangeLog b/src/ChangeLog
index 77b6334f0d4a51d7e48a236ac8659a73f675952c..39833221c2b1f518448c7dd9587eadf62290da94 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -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 --git a/src/macterm.c b/src/macterm.c
index 9e4e567ecbec406acb65c2fdb79b30c53d265997..c1806cab71433b34af739d3a38d1b8c93d4816a4 100644 (file)
--- a/src/macterm.c
+++ b/src/macterm.c
@@ -5825,7 +5825,8 @@ init_font_name_table ()
 /* 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 @@ x_list_fonts (struct frame *f,
           newlist = Fcons (build_string (font_name_table[i]), newlist);
 
           n_fonts++;
-          if (n_fonts >= maxnames)
+          if (maxnames > 0 && n_fonts >= maxnames)
             break;
         }
     }