[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] Changes to emacs/src/font.c,v
From: |
Chong Yidong |
Subject: |
[Emacs-diffs] Changes to emacs/src/font.c,v |
Date: |
Mon, 16 Jun 2008 02:04:46 +0000 |
CVSROOT: /sources/emacs
Module name: emacs
Changes by: Chong Yidong <cyd> 08/06/16 02:04:46
Index: font.c
===================================================================
RCS file: /sources/emacs/emacs/src/font.c,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -b -r1.54 -r1.55
--- font.c 16 Jun 2008 01:59:40 -0000 1.54
+++ font.c 16 Jun 2008 02:04:45 -0000 1.55
@@ -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,
- [Emacs-diffs] Changes to emacs/src/font.c,v, (continued)
- [Emacs-diffs] Changes to emacs/src/font.c,v, Kenichi Handa, 2008/06/12
- [Emacs-diffs] Changes to emacs/src/font.c,v, Kenichi Handa, 2008/06/12
- [Emacs-diffs] Changes to emacs/src/font.c,v, Kenichi Handa, 2008/06/13
- [Emacs-diffs] Changes to emacs/src/font.c,v, Juanma Barranquero, 2008/06/13
- [Emacs-diffs] Changes to emacs/src/font.c,v, Kenichi Handa, 2008/06/13
- [Emacs-diffs] Changes to emacs/src/font.c,v, Kenichi Handa, 2008/06/13
- [Emacs-diffs] Changes to emacs/src/font.c,v, Jason Rumney, 2008/06/13
- [Emacs-diffs] Changes to emacs/src/font.c,v, Andreas Schwab, 2008/06/15
- [Emacs-diffs] Changes to emacs/src/font.c,v, Chong Yidong, 2008/06/15
- [Emacs-diffs] Changes to emacs/src/font.c,v, Chong Yidong, 2008/06/15
- [Emacs-diffs] Changes to emacs/src/font.c,v,
Chong Yidong <=
- [Emacs-diffs] Changes to emacs/src/font.c,v, Kenichi Handa, 2008/06/16
- [Emacs-diffs] Changes to emacs/src/font.c,v, Jason Rumney, 2008/06/16
- [Emacs-diffs] Changes to emacs/src/font.c,v, Kenichi Handa, 2008/06/16
- [Emacs-diffs] Changes to emacs/src/font.c,v, Andreas Schwab, 2008/06/16
- [Emacs-diffs] Changes to emacs/src/font.c,v, Juanma Barranquero, 2008/06/16
- [Emacs-diffs] Changes to emacs/src/font.c,v, Juanma Barranquero, 2008/06/16
- [Emacs-diffs] Changes to emacs/src/font.c,v, Chong Yidong, 2008/06/16
- [Emacs-diffs] Changes to emacs/src/font.c,v, Stefan Monnier, 2008/06/16
- [Emacs-diffs] Changes to emacs/src/font.c,v, Chong Yidong, 2008/06/17
- [Emacs-diffs] Changes to emacs/src/font.c,v, Chong Yidong, 2008/06/17