diff options
| author | Paul Eggert <eggert@cs.ucla.edu> | 2011-04-03 23:29:11 -0700 |
|---|---|---|
| committer | Paul Eggert <eggert@cs.ucla.edu> | 2011-04-03 23:29:11 -0700 |
| commit | 56201685698d93de22abf64377d4cf5e641ed6b3 (patch) | |
| tree | 9a4be84d37ce5cb91fe47e279d1755d6646ece66 /src/font.c | |
| parent | 790771b18cec8904df45088de109b948402827ac (diff) | |
| download | emacs-56201685698d93de22abf64377d4cf5e641ed6b3.tar.gz | |
* font.c (font_list_entities): Redo for clarity,
so that reader need not know FONT_DPI_INDEX + 1 == FONT_SPACING_INDEX.
Diffstat (limited to 'src/font.c')
| -rw-r--r-- | src/font.c | 14 |
1 files changed, 6 insertions, 8 deletions
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)); |