Mercurial > emacs
changeset 49812:15e797b18d7f
(w32_list_bdf_fonts, w32_list_fonts): Negative
max_fonts parameter means list all.
| author | Jason Rumney <jasonr@gnu.org> |
|---|---|
| date | Sun, 16 Feb 2003 22:23:06 +0000 |
| parents | 3ba90bec9e2c |
| children | 615d41ae6159 |
| files | src/w32fns.c |
| diffstat | 1 files changed, 6 insertions(+), 5 deletions(-) [+] |
line wrap: on
line diff
--- a/src/w32fns.c Sun Feb 16 16:53:28 2003 +0000 +++ b/src/w32fns.c Sun Feb 16 22:23:06 2003 +0000 @@ -7340,7 +7340,7 @@ { newlist = Fcons (XCAR (tem), newlist); n_fonts++; - if (n_fonts >= max_names) + if (max_names >= 0 && n_fonts >= max_names) break; } } @@ -7354,7 +7354,8 @@ to be listed. Frame F NULL means we have not yet created any frame, which means we can't get proper size info, as we don't have a device context to use for GetTextMetrics. - MAXNAMES sets a limit on how many fonts to match. */ + MAXNAMES sets a limit on how many fonts to match. If MAXNAMES is + negative, then all matching fonts are returned. */ Lisp_Object w32_list_fonts (f, pattern, size, maxnames) @@ -7467,7 +7468,7 @@ { newlist = Fcons (XCAR (tem), newlist); n_fonts++; - if (n_fonts >= maxnames) + if (maxnames >= 0 && n_fonts >= maxnames) break; else continue; @@ -7506,7 +7507,7 @@ { newlist = Fcons (XCAR (tem), newlist); n_fonts++; - if (n_fonts >= maxnames) + if (maxnames >= 0 && n_fonts >= maxnames) break; } /* keep track of the closest matching size in case @@ -7542,7 +7543,7 @@ } /* Include any bdf fonts. */ - if (n_fonts < maxnames) + if (n_fonts < maxnames || maxnames < 0) { Lisp_Object combined[2]; combined[0] = w32_list_bdf_fonts (pattern, maxnames - n_fonts);