[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: |
Kenichi Handa |
Subject: |
[Emacs-diffs] Changes to emacs/src/font.c,v |
Date: |
Wed, 28 May 2008 11:47:02 +0000 |
CVSROOT: /cvsroot/emacs
Module name: emacs
Changes by: Kenichi Handa <handa> 08/05/28 11:47:02
Index: font.c
===================================================================
RCS file: /cvsroot/emacs/emacs/src/font.c,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -b -r1.29 -r1.30
--- font.c 25 May 2008 11:00:52 -0000 1.29
+++ font.c 28 May 2008 11:47:01 -0000 1.30
@@ -1574,11 +1574,10 @@
{
if ((*p0 != '*' || p1 - p0 > 1)
&& NILP (AREF (font_spec, FONT_FOUNDRY_INDEX)))
- ASET (font_spec, FONT_FOUNDRY_INDEX,
- font_intern_prop (p0, p1 - p0));
+ Ffont_put (font_spec, QCfoundry, font_intern_prop (p0, p1 - p0));
p1++;
len -= p1 - p0;
- ASET (font_spec, FONT_FAMILY_INDEX, font_intern_prop (p1, len));
+ Ffont_put (font_spec, QCfamily, font_intern_prop (p1, len));
}
else
ASET (font_spec, FONT_FAMILY_INDEX, Fintern (family, Qnil));
@@ -2378,11 +2377,6 @@
: diff > FONT_PIXEL_SIZE_QUANTUM))
prop = FONT_SPEC_MAX;
}
- if (prop < FONT_SPEC_MAX
- && INTEGERP (AREF (spec, FONT_SPACING_INDEX))
- && ! EQ (AREF (spec, FONT_SPACING_INDEX),
- AREF (entity, FONT_SPACING_INDEX)))
- prop = FONT_SPEC_MAX;
if (prop < FONT_SPEC_MAX)
val = Fcons (entity, val);
}
@@ -2430,12 +2424,13 @@
ftype = AREF (spec, FONT_TYPE_INDEX);
for (i = 1; i <= FONT_REGISTRY_INDEX; i++)
ASET (scratch_font_spec, i, AREF (spec, i));
- for (; i < FONT_EXTRA_INDEX; i++)
+ for (i = FONT_DPI_INDEX; i < FONT_EXTRA_INDEX; i += 2)
{
ASET (scratch_font_spec, i, Qnil);
if (! NILP (AREF (spec, i)))
need_filtering = 1;
}
+ ASET (scratch_font_spec, FONT_SPACING_INDEX, AREF (spec,
FONT_SPACING_INDEX));
ASET (scratch_font_spec, FONT_EXTRA_INDEX, AREF (spec, FONT_EXTRA_INDEX));
vec = alloca (sizeof (Lisp_Object) * num_font_drivers * n_family);
- [Emacs-diffs] Changes to emacs/src/font.c,v, (continued)
- [Emacs-diffs] Changes to emacs/src/font.c,v, Kenichi Handa, 2008/05/19
- [Emacs-diffs] Changes to emacs/src/font.c,v, Kenichi Handa, 2008/05/20
- [Emacs-diffs] Changes to emacs/src/font.c,v, Juanma Barranquero, 2008/05/20
- [Emacs-diffs] Changes to emacs/src/font.c,v, Kenichi Handa, 2008/05/21
- [Emacs-diffs] Changes to emacs/src/font.c,v, Kenichi Handa, 2008/05/21
- [Emacs-diffs] Changes to emacs/src/font.c,v, Kenichi Handa, 2008/05/22
- [Emacs-diffs] Changes to emacs/src/font.c,v, Jason Rumney, 2008/05/22
- [Emacs-diffs] Changes to emacs/src/font.c,v, Jason Rumney, 2008/05/22
- [Emacs-diffs] Changes to emacs/src/font.c,v, Jason Rumney, 2008/05/22
- [Emacs-diffs] Changes to emacs/src/font.c,v, Kenichi Handa, 2008/05/25
- [Emacs-diffs] Changes to emacs/src/font.c,v,
Kenichi Handa <=
- [Emacs-diffs] Changes to emacs/src/font.c,v, Kenichi Handa, 2008/05/29
- [Emacs-diffs] Changes to emacs/src/font.c,v, Kenichi Handa, 2008/05/30
- [Emacs-diffs] Changes to emacs/src/font.c,v, Kenichi Handa, 2008/05/31