Re: [AC sjt-xft] Re: Xft branch - code cut error in font.el
Stephen J. Turnbull <stephen(a)xemacs.org> wrote:
Actually, that's been in for weeks, along with some refactoring
of
that series of functions which may have confused the issue. Please
check and make sure that you do have the right file after a CVS
update.
Ah, my local CVS tree was checked out with sjt-xft-21-5-21 and not
sjt-xft. Now everything appears a bit faster. Thanks!
Here is another small refinement. The tree won't built without
"--with-xft", because error checking is done for a variable that doesn't
existing, because it's only created when USE_XFT is define.
Best Regards, Clemens
Index: glyphs-x.c
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/src/glyphs-x.c,v
retrieving revision 1.80.2.6
diff -u -r1.80.2.6 glyphs-x.c
--- glyphs-x.c 2005/03/15 05:24:21 1.80.2.6
+++ glyphs-x.c 2005/09/10 18:27:47
＠＠ -2352,11 +2352,13 ＠＠
}
+#ifdef USE_XFT
/* #### sanity check, should wrap in appropriate ERROR_CHECK macro */
if (!rf && !fs)
warn_when_safe_lispobj
(intern ("xft"), Qdebug,
Fcons (build_string ("missing font in update_widget_face"),
Fface_name (face)));
+#endif
}
wv->change = VISIBLE_CHANGE;
/* #### Megahack - but its just getting too complicated to do this
Index: ChangeLog.Xft
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/src/Attic/ChangeLog.Xft,v
retrieving revision 1.1.2.7
diff -u -r1.1.2.7 ChangeLog.Xft
--- ChangeLog.Xft 2005/09/06 08:24:50 1.1.2.7
+++ ChangeLog.Xft 2005/09/10 18:28:55
＠＠ -1,3 +1,8 ＠＠
+2005-09-10 Clemens Fruhwirth <clemens(a)endorphin.org>
+
+ * glyphs-x.c (update_widget_face): Wrap error checking of rf in an
+ #ifdef USE_XFT.
+
2005-09-06 Stephen J. Turnbull <stephen(a)xemacs.org>
* console-x-impl.h (struct x_frame): Rewrite comment.