Mercurial > hg > xemacs-beta

diff src/glyphs-x.c @ 4920:a96517f26e3a

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge.
author Aidan Kehoe <kehoea@parhasard.net>
date Wed, 03 Feb 2010 09:06:58 +0000
parents a6c778975d7d
children cbe181529c34
line wrap: on
line diff
--- a/src/glyphs-x.c	Wed Feb 03 09:04:35 2010 +0000
+++ b/src/glyphs-x.c	Wed Feb 03 09:06:58 2010 +0000
@@ -2376,7 +2376,7 @@
 					 face,
 					 domain));
     XFontStruct *fs = FONT_INSTANCE_X_FONT (fi);
-#ifdef USE_XFT
+#ifdef HAVE_XFT
     XftFont *rf = FONT_INSTANCE_X_XFTFONT (fi);
 
     if (rf)
@@ -2395,7 +2395,7 @@
 	lw_add_widget_value_arg (wv, XtNfont, (XtArgVal) fs);
       }
 
-#ifdef USE_XFT
+#ifdef HAVE_XFT
     /* #### sanity check, should wrap in appropriate ERROR_CHECK macro */
     if (!rf && !fs)
       warn_when_safe_lispobj