Commit 9903d1e6 authored by Kenichi Handa's avatar Kenichi Handa
Browse files

(font_parse_family_registry): Fix for one-char foundry.

(font_sort_entities): Initialize prefer_prop[FONT_AVGWIDTH_INDEX].
parent b8321d86
2009-06-10 Kenichi Handa <handa@m17n.org>
* font.c (font_parse_family_registry): Fix for one-char foundry.
(font_sort_entities): Initialize prefer_prop[FONT_AVGWIDTH_INDEX].
2009-06-09 Dmitry Dzhus <dima@sphinx.net.ru> (tiny change)
* process.c (status_message): Fix handling of multibyte signal
......
......@@ -1844,7 +1844,7 @@ font_parse_family_registry (family, registry, font_spec)
p1 = index (p0, '-');
if (p1)
{
if ((*p0 != '*' || p1 - p0 > 1)
if ((*p0 != '*' && p1 - p0 > 0)
&& NILP (AREF (font_spec, FONT_FOUNDRY_INDEX)))
Ffont_put (font_spec, QCfoundry, font_intern_prop (p0, p1 - p0, 1));
p1++;
......@@ -2326,7 +2326,7 @@ font_sort_entities (vec, prefer, frame, best_only)
USE_SAFE_ALLOCA;
len = ASIZE (vec);
for (i = FONT_WEIGHT_INDEX; i <= FONT_DPI_INDEX; i++)
for (i = FONT_WEIGHT_INDEX; i <= FONT_AVGWIDTH_INDEX; i++)
prefer_prop[i] = AREF (prefer, i);
if (FLOATP (prefer_prop[FONT_SIZE_INDEX]))
prefer_prop[FONT_SIZE_INDEX]
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment