[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] /srv/bzr/emacs/trunk r100814: Do not record a font-entity
From: |
Kenichi Handa |
Subject: |
[Emacs-diffs] /srv/bzr/emacs/trunk r100814: Do not record a font-entity in the property of font-object. |
Date: |
Wed, 14 Jul 2010 12:54:58 +0900 |
User-agent: |
Bazaar (2.0.3) |
------------------------------------------------------------
revno: 100814 [merge]
committer: Kenichi Handa <address@hidden>
branch nick: trunk
timestamp: Wed 2010-07-14 12:54:58 +0900
message:
Do not record a font-entity in the property of font-object.
modified:
src/ChangeLog
src/font.c
=== modified file 'src/ChangeLog'
--- a/src/ChangeLog 2010-07-13 10:57:00 +0000
+++ b/src/ChangeLog 2010-07-14 03:53:53 +0000
@@ -1,3 +1,8 @@
+2010-07-14 Kenichi Handa <address@hidden>
+
+ * font.c (font_open_entity): Cancel previous change.
+ (Ffont_get): Don't check FONT_ENTITY_INDEX of a font-object.
+
2010-07-13 Eli Zaretskii <address@hidden>
Remove subprocesses #ifdefs.
=== modified file 'src/font.c'
--- a/src/font.c 2010-07-12 02:28:50 +0000
+++ b/src/font.c 2010-07-14 03:40:47 +0000
@@ -3005,7 +3005,6 @@
return Qnil;
ASET (entity, FONT_OBJLIST_INDEX,
Fcons (font_object, AREF (entity, FONT_OBJLIST_INDEX)));
- ASET (font_object, FONT_ENTITY_INDEX, entity);
num_fonts++;
font = XFONT_OBJECT (font_object);
@@ -4131,20 +4130,12 @@
if (NILP (val) && EQ (key, QCotf) && FONT_OBJECT_P (font))
{
struct font *fontp = XFONT_OBJECT (font);
- Lisp_Object entity = AREF (font, FONT_ENTITY_INDEX);
- val = Fassq (key, AREF (entity, FONT_EXTRA_INDEX));
- if (NILP (val))
- {
- if (fontp->driver->otf_capability)
- val = fontp->driver->otf_capability (fontp);
- else
- val = Fcons (Qnil, Qnil);
- font_put_extra (font, QCotf, val);
- font_put_extra (entity, QCotf, val);
- }
+ if (fontp->driver->otf_capability)
+ val = fontp->driver->otf_capability (fontp);
else
- val = Fcdr (val);
+ val = Fcons (Qnil, Qnil);
+ font_put_extra (font, QCotf, val);
}
else
val = Fcdr (val);
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] /srv/bzr/emacs/trunk r100814: Do not record a font-entity in the property of font-object.,
Kenichi Handa <=