aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorKim F. Storm2006-05-20 22:01:18 +0000
committerKim F. Storm2006-05-20 22:01:18 +0000
commit41a9b76e813b1fd7783acc96fe4083a5dcab84a3 (patch)
tree95c3661cddc3bff1ad7563dac4f359ab3c0aea26 /src
parent372ef0ab5091c5940ad4ecf84c68f1cbad032c3b (diff)
downloademacs-41a9b76e813b1fd7783acc96fe4083a5dcab84a3.tar.gz
emacs-41a9b76e813b1fd7783acc96fe4083a5dcab84a3.zip
(best_matching_font): Fix crash in 2006-05-17 change.
Diffstat (limited to 'src')
-rw-r--r--src/xfaces.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/xfaces.c b/src/xfaces.c
index b65efa7961e..2029f8fe65c 100644
--- a/src/xfaces.c
+++ b/src/xfaces.c
@@ -6636,7 +6636,7 @@ best_matching_font (f, attrs, fonts, nfonts, width_ratio, needs_overstrike)
6636 best = NULL; 6636 best = NULL;
6637 6637
6638 /* Find the best match among the non-scalable fonts. */ 6638 /* Find the best match among the non-scalable fonts. */
6639 for (i = 1; i < nfonts; ++i) 6639 for (i = 0; i < nfonts; ++i)
6640 if (!font_scalable_p (fonts + i) 6640 if (!font_scalable_p (fonts + i)
6641 && better_font_p (specified, fonts + i, best, 1, avgwidth)) 6641 && better_font_p (specified, fonts + i, best, 1, avgwidth))
6642 { 6642 {
@@ -7073,7 +7073,7 @@ realize_default_face (f)
7073 face = realize_face (c, attrs, 0, NULL, DEFAULT_FACE_ID); 7073 face = realize_face (c, attrs, 0, NULL, DEFAULT_FACE_ID);
7074 7074
7075#ifdef HAVE_WINDOW_SYSTEM 7075#ifdef HAVE_WINDOW_SYSTEM
7076#ifdef HAVE_X_WINDOWS 7076#ifdef HAVE_X_WINDOWS
7077 if (face->font != FRAME_FONT (f)) 7077 if (face->font != FRAME_FONT (f))
7078 /* As the font specified for the frame was not acceptable as a 7078 /* As the font specified for the frame was not acceptable as a
7079 font for the default face (perhaps because auto-scaled fonts 7079 font for the default face (perhaps because auto-scaled fonts