aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChong Yidong2008-06-17 05:33:06 +0000
committerChong Yidong2008-06-17 05:33:06 +0000
commit84d50b7123ab74cf7168ffb6c2b1ee1146bb344c (patch)
treeb94d3e1190c42f0ad5de2a54aaa44a6c420654dc
parent0c36bc4ede7afcf853a865d07036207cc8853a6c (diff)
downloademacs-84d50b7123ab74cf7168ffb6c2b1ee1146bb344c.tar.gz
emacs-84d50b7123ab74cf7168ffb6c2b1ee1146bb344c.zip
(font_parse_fcname): Store divider characters for unknown-spec list.
-rw-r--r--src/font.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/font.c b/src/font.c
index 51b7c2ec220..962e8a308f2 100644
--- a/src/font.c
+++ b/src/font.c
@@ -1409,7 +1409,7 @@ font_parse_fcname (name, font)
1409 the key QCfc_unknown_spec. */ 1409 the key QCfc_unknown_spec. */
1410 char *copy_start, *copy; 1410 char *copy_start, *copy;
1411 1411
1412 copy_start = copy = alloca (name + len - props_beg); 1412 copy_start = copy = alloca (name + len - props_beg + 2);
1413 if (! copy) 1413 if (! copy)
1414 return -1; 1414 return -1;
1415 1415
@@ -1450,6 +1450,7 @@ font_parse_fcname (name, font)
1450 else 1450 else
1451 { 1451 {
1452 /* Unknown key */ 1452 /* Unknown key */
1453 *copy++ = ':';
1453 bcopy (p, copy, word_len); 1454 bcopy (p, copy, word_len);
1454 copy += word_len; 1455 copy += word_len;
1455 } 1456 }
@@ -1482,8 +1483,7 @@ font_parse_fcname (name, font)
1482 Ffont_put (font, key, val); 1483 Ffont_put (font, key, val);
1483 else 1484 else
1484 { 1485 {
1485 if (copy_start != copy) 1486 *copy++ = ':';
1486 *copy++ = ':';
1487 bcopy (keyhead, copy, q - keyhead); 1487 bcopy (keyhead, copy, q - keyhead);
1488 copy += q - keyhead; 1488 copy += q - keyhead;
1489 } 1489 }