From: Chong Yidong <cyd@stupidchicken.com>
Date: Mon, 16 Jun 2008 01:59:40 +0000 (+0000)
Subject: (font_parse_fcname): Correctly parse KEY=VAL values.
X-Git-Tag: emacs-pretest-23.0.90~4745
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=90c00b018dde161df77af51ef596101f9c9bc3bb;p=emacs.git

(font_parse_fcname): Correctly parse KEY=VAL values.
---

diff --git a/src/font.c b/src/font.c
index 72b35f820d9..ace61a3e450 100644
--- a/src/font.c
+++ b/src/font.c
@@ -1467,7 +1467,7 @@ font_parse_fcname (name, font)
 		  Lisp_Object key;
 		  char *keyhead = p;
 
-		  if (PROP_MATCH ("pixelsize=", 10))
+		  if (word_len == 9 && memcmp (p, "pixelsize=", 10) == 0)
 		    prop = FONT_SIZE_INDEX;
 		  else
 		    {
@@ -1477,7 +1477,7 @@ font_parse_fcname (name, font)
 		  p = q + 1;
 		  for (q = p; *q && *q != ':'; q++);
 
-		  val = font_intern_prop (p, word_len, 0);
+		  val = font_intern_prop (p, q - p, 0);
 		  if (! NILP (val))
 		    {
 		      if (prop >= FONT_FOUNDRY_INDEX