[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: |
Tue, 17 Jun 2008 16:04:48 +0000 |
CVSROOT: /sources/emacs
Module name: emacs
Changes by: Chong Yidong <cyd> 08/06/17 16:04:47
Index: font.c
===================================================================
RCS file: /sources/emacs/emacs/src/font.c,v
retrieving revision 1.64
retrieving revision 1.65
diff -u -b -r1.64 -r1.65
--- font.c 17 Jun 2008 05:33:06 -0000 1.64
+++ font.c 17 Jun 2008 16:04:47 -0000 1.65
@@ -1359,8 +1359,7 @@
p++;
else if (*p == ':')
{
- family_end = p;
- props_beg = p + 1;
+ props_beg = family_end = p;
break;
}
else if (*p == '-')
@@ -1400,7 +1399,7 @@
double point_size = strtod (size_beg, &size_end);
ASET (font, FONT_SIZE_INDEX, make_float (point_size));
if (*size_end == ':' && size_end[1])
- props_beg = size_end + 1;
+ props_beg = size_end;
}
if (props_beg)
{
@@ -1408,22 +1407,21 @@
extra, copy unknown ones to COPY. It is stored in extra slot by
the key QCfc_unknown_spec. */
char *copy_start, *copy;
+ Lisp_Object val;
copy_start = copy = alloca (name + len - props_beg + 2);
if (! copy)
return -1;
- p = props_beg;
- while (*p)
+ for (p = props_beg; *p; p = q)
{
- 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. */
+ int word_len;
+ p = p + 1;
+ word_len = q - p;
val = font_intern_prop (p, q - p, 1);
#define PROP_MATCH(STR,N) ((word_len == N) && memcmp (p, STR, N) == 0)
@@ -1456,12 +1454,14 @@
}
#undef PROP_MATCH
}
- else /* KEY=VAL pairs */
+ else
{
+ /* KEY=VAL pairs */
Lisp_Object key;
char *keyhead = p;
+ int prop;
- if (word_len == 9 && memcmp (p, "pixelsize=", 10) == 0)
+ if (q - p == 10 && memcmp (p + 1, "pixelsize", 9) == 0)
prop = FONT_SIZE_INDEX;
else
{
@@ -1483,13 +1483,11 @@
Ffont_put (font, key, val);
else
{
- *copy++ = ':';
bcopy (keyhead, copy, q - keyhead);
copy += q - keyhead;
}
}
}
- p = *q ? q + 1 : q;
}
if (copy_start != 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, Chong Yidong, 2008/06/15
- [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 <=
- [Emacs-diffs] Changes to emacs/src/font.c,v, Andreas Schwab, 2008/06/18
- [Emacs-diffs] Changes to emacs/src/font.c,v, Kenichi Handa, 2008/06/18
- [Emacs-diffs] Changes to emacs/src/font.c,v, Chong Yidong, 2008/06/20
- [Emacs-diffs] Changes to emacs/src/font.c,v, Kenichi Handa, 2008/06/22
- [Emacs-diffs] Changes to emacs/src/font.c,v, Kenichi Handa, 2008/06/24
- [Emacs-diffs] Changes to emacs/src/font.c,v, Jason Rumney, 2008/06/24
- [Emacs-diffs] Changes to emacs/src/font.c,v, Kenichi Handa, 2008/06/25