From 56201685698d93de22abf64377d4cf5e641ed6b3 Mon Sep 17 00:00:00 2001 From: Paul Eggert Date: Sun, 3 Apr 2011 23:29:11 -0700 Subject: [PATCH] * font.c (font_list_entities): Redo for clarity, so that reader need not know FONT_DPI_INDEX + 1 == FONT_SPACING_INDEX. --- src/ChangeLog | 5 +++++ src/font.c | 14 ++++++-------- 2 files changed, 11 insertions(+), 8 deletions(-) diff --git a/src/ChangeLog b/src/ChangeLog index 49ba5ef3462..ebe2e082e66 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,8 @@ +2011-04-04 Paul Eggert + + * font.c (font_list_entities): Redo for clarity, + so that reader need not know FONT_DPI_INDEX + 1 == FONT_SPACING_INDEX. + 2011-04-03 Paul Eggert * font.c (font_find_for_lface, Ffont_get_glyphs): Remove unused vars. diff --git a/src/font.c b/src/font.c index 5d67c0032e6..e01f67a95f6 100644 --- a/src/font.c +++ b/src/font.c @@ -2697,14 +2697,12 @@ font_list_entities (Lisp_Object frame, Lisp_Object spec) for (i = FONT_FOUNDRY_INDEX; i <= FONT_REGISTRY_INDEX; i++) ASET (scratch_font_spec, i, AREF (spec, i)); for (i = FONT_WEIGHT_INDEX; i < FONT_EXTRA_INDEX; i++) - { - ASET (scratch_font_spec, i, Qnil); - if (! NILP (AREF (spec, i))) - need_filtering = 1; - if (i == FONT_DPI_INDEX) - /* Skip FONT_SPACING_INDEX */ - i++; - } + if (i != FONT_SPACING_INDEX) + { + ASET (scratch_font_spec, i, Qnil); + if (! NILP (AREF (spec, i))) + need_filtering = 1; + } ASET (scratch_font_spec, FONT_SPACING_INDEX, AREF (spec, FONT_SPACING_INDEX)); ASET (scratch_font_spec, FONT_EXTRA_INDEX, AREF (spec, FONT_EXTRA_INDEX)); -- 2.39.2