Mercurial > hg > xemacs-beta

diff src/inline.c @ 5118:e0db3c197671 ben-lisp-object

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge up to latest default branch, doesn't compile yet
author Ben Wing <ben@xemacs.org>
date Sat, 26 Dec 2009 21:18:49 -0600
parents 8f1ee2d15784
children d1247f3cc363
line wrap: on
line diff
--- a/src/inline.c	Sat Dec 26 00:20:27 2009 -0600
+++ b/src/inline.c	Sat Dec 26 21:18:49 2009 -0600
@@ -35,8 +35,8 @@
    */
 
 /* Note to maintainers: This file contains a list of all header files
-   that use the INLINE macro, either directly, or by using DECLARE_LRECORD.
-   i.e. the output of ``grep -l -w 'DECLARE_LRECORD|INLINE_HEADER' *.h'' */
+   that use the INLINE macro, either directly, or by using DECLARE_LISP_OBJECT.
+   i.e. the output of ``grep -l -w 'DECLARE_LISP_OBJECT|INLINE_HEADER' *.h'' */
 
 #define DONT_EXTERN_INLINE_HEADER_FUNCTIONS
 
@@ -64,6 +64,7 @@
 #include "process.h"
 #include "rangetab.h"
 #include "specifier.h"
+#include "symeval.h"
 #include "syntax.h"
 #include "window.h"
 
@@ -100,6 +101,9 @@
 
 #ifdef HAVE_X_WINDOWS
 #include "glyphs-x.h"
+#ifdef USE_XFT
+#include "font-mgr.h"
+#endif
 #endif
 
 #ifdef HAVE_MS_WINDOWS