Mercurial > emacs
changeset 70795:1d1c6a83c277
(best_matching_font): Fix crash in 2006-05-17 change.
author | Kim F. Storm <storm@cua.dk> |
---|---|
date | Sat, 20 May 2006 22:01:18 +0000 |
parents | 6f2bfdfe1af7 |
children | def5b739b86b |
files | src/xfaces.c |
diffstat | 1 files changed, 2 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/src/xfaces.c Sat May 20 20:43:15 2006 +0000 +++ b/src/xfaces.c Sat May 20 22:01:18 2006 +0000 @@ -6636,7 +6636,7 @@ best = NULL; /* Find the best match among the non-scalable fonts. */ - for (i = 1; i < nfonts; ++i) + for (i = 0; i < nfonts; ++i) if (!font_scalable_p (fonts + i) && better_font_p (specified, fonts + i, best, 1, avgwidth)) { @@ -7073,7 +7073,7 @@ face = realize_face (c, attrs, 0, NULL, DEFAULT_FACE_ID); #ifdef HAVE_WINDOW_SYSTEM -#ifdef HAVE_X_WINDOWS +#ifdef HAVE_X_WINDOWS if (face->font != FRAME_FONT (f)) /* As the font specified for the frame was not acceptable as a font for the default face (perhaps because auto-scaled fonts