Mercurial > emacs
changeset 90499:32b8f672da38
(xftfont_prepare_face): Cancel previous change.
(xftfont_done_face): Likewise.
| author | Kenichi Handa <handa@m17n.org> |
|---|---|
| date | Wed, 28 Jun 2006 05:39:02 +0000 |
| parents | fa27e8839f68 |
| children | 60e0667ab709 |
| files | src/xftfont.c |
| diffstat | 1 files changed, 6 insertions(+), 0 deletions(-) [+] |
line wrap: on
line diff
--- a/src/xftfont.c Mon Jun 26 04:28:27 2006 +0000 +++ b/src/xftfont.c Wed Jun 28 05:39:02 2006 +0000 @@ -364,11 +364,14 @@ { struct xftface_info *xftface_info; +#if 0 + /* This doesn't work if face->ascii_face doesn't use an Xft font. */ if (face != face->ascii_face) { face->extra = face->ascii_face->extra; return 0; } +#endif xftface_info = malloc (sizeof (struct xftface_info)); if (! xftface_info) @@ -394,9 +397,12 @@ { struct xftface_info *xftface_info; +#if 0 + /* This doesn't work if face->ascii_face doesn't use an Xft font. */ if (face != face->ascii_face || ! face->extra) return; +#endif xftface_info = (struct xftface_info *) face->extra; BLOCK_INPUT;