diff options
author | Kenichi Handa <handa@m17n.org> | 2006-06-28 05:39:02 +0000 |
---|---|---|
committer | Kenichi Handa <handa@m17n.org> | 2006-06-28 05:39:02 +0000 |
commit | a703d27dea4dbe96b588f9b1563b3b4ad7409eef (patch) | |
tree | f289cd6f90b618e51a8e9f41767eaafc43b911f7 /src/xftfont.c | |
parent | 8123c0255e765863007a1fa5d0d1a924da98179c (diff) | |
download | emacs-a703d27dea4dbe96b588f9b1563b3b4ad7409eef.tar.gz |
(xftfont_prepare_face): Cancel previous change.
(xftfont_done_face): Likewise.
Diffstat (limited to 'src/xftfont.c')
-rw-r--r-- | src/xftfont.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/src/xftfont.c b/src/xftfont.c index 842f3873c49..4d9d527a641 100644 --- a/src/xftfont.c +++ b/src/xftfont.c @@ -364,11 +364,14 @@ xftfont_prepare_face (f, face) { 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 @@ xftfont_done_face (f, face) { 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; |