[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] /srv/bzr/emacs/trunk r105420: Don't lose extra font info w
From: |
Chong Yidong |
Subject: |
[Emacs-diffs] /srv/bzr/emacs/trunk r105420: Don't lose extra font info when using the Fontconfig font cache. |
Date: |
Mon, 08 Aug 2011 10:49:34 -0400 |
User-agent: |
Bazaar (2.3.1) |
------------------------------------------------------------
revno: 105420
fixes bug(s): http://debbugs.gnu.org/8109
committer: Chong Yidong <address@hidden>
branch nick: trunk
timestamp: Mon 2011-08-08 10:49:34 -0400
message:
Don't lose extra font info when using the Fontconfig font cache.
* src/ftfont.c (ftfont_pattern_entity): Copy the extras argument to
the font entity extracted from the cache.
modified:
src/ChangeLog
src/ftfont.c
=== modified file 'src/ChangeLog'
--- a/src/ChangeLog 2011-08-07 19:40:08 +0000
+++ b/src/ChangeLog 2011-08-08 14:49:34 +0000
@@ -1,3 +1,8 @@
+2011-08-08 Chong Yidong <address@hidden>
+
+ * ftfont.c (ftfont_pattern_entity): Copy the extras argument to
+ the font entity extracted from the cache (Bug#8109).
+
2011-08-07 Chong Yidong <address@hidden>
* composite.c (autocmp_chars): Don't reset point. That is done by
=== modified file 'src/ftfont.c'
--- a/src/ftfont.c 2011-06-18 18:09:17 +0000
+++ b/src/ftfont.c 2011-08-08 14:49:34 +0000
@@ -214,6 +214,10 @@
for (i = 0; i < FONT_OBJLIST_INDEX; i++)
ASET (val, i, AREF (entity, i));
+
+ ASET (val, FONT_EXTRA_INDEX, Fcopy_sequence (extra));
+ font_put_extra (val, QCfont_entity, key);
+
return val;
}
entity = font_make_entity ();
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] /srv/bzr/emacs/trunk r105420: Don't lose extra font info when using the Fontconfig font cache.,
Chong Yidong <=