procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Tweak last change.

Browse source
This commit is contained in:
Chong Yidong 2008-06-16 02:04:45 +00:00
parent 90c00b018d
commit 9277a69d80
1 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
src/font.c
View file

@ -1428,14 +1428,15 @@ font_parse_fcname (name, font)
Lisp_Object val;
int word_len, prop;
#define PROP_MATCH(STR,N) ((word_len == N) && memcmp (p, STR, N) == 0)
for (q = p + 1; *q && *q != '=' && *q != ':'; q++);
word_len = q - p;
if (*q != '=')
{
/* Must be an enumerated value. */
val = font_intern_prop (p, q - p, 1);
#define PROP_MATCH(STR,N) ((word_len == N) && memcmp (p, STR, N) == 0)
if (PROP_MATCH ("light", 5)
|| PROP_MATCH ("medium", 6)
|| PROP_MATCH ("demibold", 8)
@ -1461,6 +1462,7 @@ font_parse_fcname (name, font)
bcopy (p, copy, word_len);
copy += word_len;
}
#undef PROP_MATCH
}
else /* KEY=VAL pairs */
{
@ -1492,7 +1494,6 @@ font_parse_fcname (name, font)
}
}
p = *q ? q + 1 : q;
#undef PROP_MATCH
}
if (name != copy)
font_put_extra (font, QCfc_unknown_spec,