From: Chong Yidong <cyd@stupidchicken.com>
Date: Mon, 16 Jun 2008 02:04:45 +0000 (+0000)
Subject: Tweak last change.
X-Git-Tag: emacs-pretest-23.0.90~4744
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=9277a69d804e0779205caad6a34aab7f376923c7;p=emacs.git

Tweak last change.
---

diff --git a/src/font.c b/src/font.c
index ace61a3e450..3d4ab375c96 100644
--- a/src/font.c
+++ b/src/font.c
@@ -1428,14 +1428,15 @@ font_parse_fcname (name, font)
 	      Lisp_Object val;
 	      int word_len, prop;
 
-#define PROP_MATCH(STR,N) ((word_len == N) && memcmp (p, STR, N) == 0)
-
 	      for (q = p + 1; *q && *q != '=' && *q != ':'; q++);
 	      word_len = q - p;
 	      if (*q != '=')
 		{
 		  /* Must be an enumerated value.  */
 		  val = font_intern_prop (p, q - p, 1);
+
+#define PROP_MATCH(STR,N) ((word_len == N) && memcmp (p, STR, N) == 0)
+
 		  if (PROP_MATCH ("light", 5)
 		      || PROP_MATCH ("medium", 6)
 		      || PROP_MATCH ("demibold", 8)
@@ -1461,6 +1462,7 @@ font_parse_fcname (name, font)
 		      bcopy (p, copy, word_len);
 		      copy += word_len;
 		    }
+#undef PROP_MATCH
 		}
 	      else /* KEY=VAL pairs  */
 		{
@@ -1492,7 +1494,6 @@ font_parse_fcname (name, font)
 		    }
 		}
 	      p = *q ? q + 1 : q;
-#undef PROP_MATCH
 	    }
 	  if (name != copy)
 	    font_put_extra (font, QCfc_unknown_spec,