From: Kenichi Handa <handa@m17n.org>
Date: Tue, 3 Jun 2008 11:50:33 +0000 (+0000)
Subject: (font_parse_fcname): Fix handling of unknown key.
X-Git-Tag: emacs-pretest-23.0.90~5131
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=e6cb3cf55ff0a1a7c637528804a246edf3e77fad;p=emacs.git

(font_parse_fcname): Fix handling of unknown key.
---

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)
 	}
       else
 	{
+	  char *keyhead = p0;
+
 	  if (memcmp (p0 + 1, "pixelsize=", 10) == 0)
 	    prop = FONT_SIZE_INDEX;
 	  else
@@ -1423,8 +1425,8 @@ font_parse_fcname (name, font)
 	      else if (prop >= 0)
 		Ffont_put (font, key, val);
 	      else
-		bcopy (p0 - 1, copy, p1 - p0 + 1);
-	      copy += p1 - p0 + 1;
+		bcopy (keyhead, copy, p1 - keyhead);
+	      copy += p1 - keyhead;
 	    }
 	}
       p0 = p1;