aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorKenichi Handa2008-06-03 11:50:33 +0000
committerKenichi Handa2008-06-03 11:50:33 +0000
commite6cb3cf55ff0a1a7c637528804a246edf3e77fad (patch)
treee3ab79555537d1a205c8af7ea74c7f74e287f41b /src
parent9d3d42fb740e4921418e5ccabd71519b1c468292 (diff)
downloademacs-e6cb3cf55ff0a1a7c637528804a246edf3e77fad.tar.gz
emacs-e6cb3cf55ff0a1a7c637528804a246edf3e77fad.zip
(font_parse_fcname): Fix handling of unknown key.
Diffstat (limited to 'src')
-rw-r--r--src/font.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/src/font.c b/src/font.c
index 81a4914ba79..4511df90b83 100644
--- a/src/font.c
+++ b/src/font.c
@@ -1406,6 +1406,8 @@ font_parse_fcname (name, font)
1406 } 1406 }
1407 else 1407 else
1408 { 1408 {
1409 char *keyhead = p0;
1410
1409 if (memcmp (p0 + 1, "pixelsize=", 10) == 0) 1411 if (memcmp (p0 + 1, "pixelsize=", 10) == 0)
1410 prop = FONT_SIZE_INDEX; 1412 prop = FONT_SIZE_INDEX;
1411 else 1413 else
@@ -1423,8 +1425,8 @@ font_parse_fcname (name, font)
1423 else if (prop >= 0) 1425 else if (prop >= 0)
1424 Ffont_put (font, key, val); 1426 Ffont_put (font, key, val);
1425 else 1427 else
1426 bcopy (p0 - 1, copy, p1 - p0 + 1); 1428 bcopy (keyhead, copy, p1 - keyhead);
1427 copy += p1 - p0 + 1; 1429 copy += p1 - keyhead;
1428 } 1430 }
1429 } 1431 }
1430 p0 = p1; 1432 p0 = p1;