aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKenichi Handa2006-06-28 05:39:02 +0000
committerKenichi Handa2006-06-28 05:39:02 +0000
commita703d27dea4dbe96b588f9b1563b3b4ad7409eef (patch)
treef289cd6f90b618e51a8e9f41767eaafc43b911f7
parent8123c0255e765863007a1fa5d0d1a924da98179c (diff)
downloademacs-a703d27dea4dbe96b588f9b1563b3b4ad7409eef.tar.gz
emacs-a703d27dea4dbe96b588f9b1563b3b4ad7409eef.zip
(xftfont_prepare_face): Cancel previous change.
(xftfont_done_face): Likewise.
-rw-r--r--src/xftfont.c6
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)
364{ 364{
365 struct xftface_info *xftface_info; 365 struct xftface_info *xftface_info;
366 366
367#if 0
368 /* This doesn't work if face->ascii_face doesn't use an Xft font. */
367 if (face != face->ascii_face) 369 if (face != face->ascii_face)
368 { 370 {
369 face->extra = face->ascii_face->extra; 371 face->extra = face->ascii_face->extra;
370 return 0; 372 return 0;
371 } 373 }
374#endif
372 375
373 xftface_info = malloc (sizeof (struct xftface_info)); 376 xftface_info = malloc (sizeof (struct xftface_info));
374 if (! xftface_info) 377 if (! xftface_info)
@@ -394,9 +397,12 @@ xftfont_done_face (f, face)
394{ 397{
395 struct xftface_info *xftface_info; 398 struct xftface_info *xftface_info;
396 399
400#if 0
401 /* This doesn't work if face->ascii_face doesn't use an Xft font. */
397 if (face != face->ascii_face 402 if (face != face->ascii_face
398 || ! face->extra) 403 || ! face->extra)
399 return; 404 return;
405#endif
400 406
401 xftface_info = (struct xftface_info *) face->extra; 407 xftface_info = (struct xftface_info *) face->extra;
402 BLOCK_INPUT; 408 BLOCK_INPUT;