# HG changeset patch
# User Chong Yidong <cyd@stupidchicken.com>
# Date 1213581885 0
# Node ID cf2b26adbb9bf78764c1a34f284a1fa35a712da2
# Parent  104a55eb192aa6ffa01d12b1e6d728969b22809d
Tweak last change.

diff -r 104a55eb192a -r cf2b26adbb9b src/font.c
--- a/src/font.c	Mon Jun 16 01:59:40 2008 +0000
+++ b/src/font.c	Mon Jun 16 02:04:45 2008 +0000
@@ -1428,14 +1428,15 @@
 	      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 @@
 		      bcopy (p, copy, word_len);
 		      copy += word_len;
 		    }
+#undef PROP_MATCH
 		}
 	      else /* KEY=VAL pairs  */
 		{
@@ -1492,7 +1494,6 @@
 		    }
 		}
 	      p = *q ? q + 1 : q;
-#undef PROP_MATCH
 	    }
 	  if (name != copy)
 	    font_put_extra (font, QCfc_unknown_spec,