comparison src/font.c @ 95984:cf2b26adbb9b

Tweak last change.

95983:104a55eb192a

	  while (*p)
	    {
	      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);
		  if (PROP_MATCH ("light", 5)
		      || PROP_MATCH ("medium", 6)
		      || PROP_MATCH ("demibold", 8)
		      || PROP_MATCH ("bold", 4)
		      || PROP_MATCH ("black", 5))

		    {
		      /* Unknown key  */
		      bcopy (p, copy, word_len);
		      copy += word_len;
		    }
		}
	      else /* KEY=VAL pairs  */
		{
		  Lisp_Object key;
		  char *keyhead = p;

			bcopy (keyhead, copy, q - keyhead);
		      copy += q - keyhead;
		    }
		}
	      p = *q ? q + 1 : q;
#undef PROP_MATCH
	    }
	  if (name != copy)
	    font_put_extra (font, QCfc_unknown_spec,
			    make_unibyte_string (name, copy - name));
	}

95984:cf2b26adbb9b

	  while (*p)
	    {
	      Lisp_Object val;
	      int word_len, prop;

	      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)
		      || PROP_MATCH ("bold", 4)
		      || PROP_MATCH ("black", 5))

		    {
		      /* Unknown key  */
		      bcopy (p, copy, word_len);
		      copy += word_len;
		    }
#undef PROP_MATCH
		}
	      else /* KEY=VAL pairs  */
		{
		  Lisp_Object key;
		  char *keyhead = p;

			bcopy (keyhead, copy, q - keyhead);
		      copy += q - keyhead;
		    }
		}
	      p = *q ? q + 1 : q;
	    }
	  if (name != copy)
	    font_put_extra (font, QCfc_unknown_spec,
			    make_unibyte_string (name, copy - name));
	}