summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChong Yidong <cyd@stupidchicken.com>2011-01-26 11:28:49 -0500
committerChong Yidong <cyd@stupidchicken.com>2011-01-26 11:28:49 -0500
commitea08011c7eaee19a1defe5c9880a40842ab6d28a (patch)
tree0512ff393cf1bb8d0ecc9893fdec344542798cd5
parent0d19d4feaa653a315853716e64bbaddb210a26ca (diff)
downloademacs-ea08011c7eaee19a1defe5c9880a40842ab6d28a.tar.gz
* src/font.c (font_parse_fcname): Fix typo in string length.
-rw-r--r--src/ChangeLog4
-rw-r--r--src/font.c2
2 files changed, 5 insertions, 1 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index 0539b849efc..bbfd9592cf1 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,7 @@
+2011-01-26 Chong Yidong <cyd@stupidchicken.com>
+
+ * font.c (font_parse_fcname): Fix typo in string length.
+
2011-01-24 Stefan Monnier <monnier@iro.umontreal.ca>
* xdisp.c (handle_fontified_prop): Be careful with font-lock changing
diff --git a/src/font.c b/src/font.c
index c08477821ed..96c043626f2 100644
--- a/src/font.c
+++ b/src/font.c
@@ -1603,7 +1603,7 @@ font_parse_fcname (name, font)
else if (PROP_MATCH ("Italic", 6))
{
prop_found = 1;
- prop = font_intern_prop ("italic", 4, 1);
+ prop = font_intern_prop ("italic", 6, 1);
FONT_SET_STYLE (font, FONT_SLANT_INDEX, prop);
}
else if (PROP_MATCH ("Oblique", 7))