Mercurial > emacs
changeset 52392:ea78742dd7ca
(w32_per_char_metric): Allow cached metrics to be
returned even when font_type is unknown.
| author | Jason Rumney <jasonr@gnu.org> |
|---|---|
| date | Sun, 31 Aug 2003 22:15:15 +0000 |
| parents | 1ef98df61d74 |
| children | 3978cfc630d9 |
| files | src/ChangeLog src/w32term.c |
| diffstat | 2 files changed, 5 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/src/ChangeLog Sun Aug 31 21:38:07 2003 +0000 +++ b/src/ChangeLog Sun Aug 31 22:15:15 2003 +0000 @@ -1,5 +1,8 @@ 2003-08-31 Jason Rumney <jasonr@gnu.org> + * w32term.c (w32_per_char_metric): Allow cached metrics to be + returned even when font_type is unknown. + * xdisp.c (init_iterator): Remove old WINDOWSNT conditional. 2003-08-30 Jan Dj,Ad(Brv <jan.h.d@swipnet.se>
--- a/src/w32term.c Sun Aug 31 21:38:07 2003 +0000 +++ b/src/w32term.c Sun Aug 31 22:15:15 2003 +0000 @@ -895,7 +895,6 @@ BOOL retval; xassert (font && char2b); - xassert (font_type != UNKNOWN_FONT); /* Handle the common cases quickly. */ if (!font->bdf && font->per_char == NULL) @@ -904,6 +903,8 @@ else if (!font->bdf && *char2b < 128) return &font->per_char[*char2b]; + xassert (font_type != UNKNOWN_FONT); + pcm = &font->scratch; if (font_type == BDF_1D_FONT)