diff options
| author | Andrew Choi <akochoi@shaw.ca> | 2003-04-25 04:32:25 +0000 |
|---|---|---|
| committer | Andrew Choi <akochoi@shaw.ca> | 2003-04-25 04:32:25 +0000 |
| commit | 0b325c12a2332c696fdc87478d418d43e013ee22 (patch) | |
| tree | e77ab7bd1debce79272065f4d575df4fa6ef3f0b | |
| parent | 10b97bf735aa1144afe2efe8e95a000dc2775076 (diff) | |
| download | emacs-0b325c12a2332c696fdc87478d418d43e013ee22.tar.gz emacs-0b325c12a2332c696fdc87478d418d43e013ee22.tar.bz2 emacs-0b325c12a2332c696fdc87478d418d43e013ee22.zip | |
* macterm.c (x_list_fonts): Return all fonts that match if maxnames = -1.
| -rw-r--r-- | src/ChangeLog | 5 | ||||
| -rw-r--r-- | src/macterm.c | 5 |
2 files changed, 8 insertions, 2 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index 77b6334f0d4..39833221c2b 100644 --- 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 9e4e567ecbe..c1806cab714 100644 --- 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; } } |