Merge from mainline.

[gnu-emacs] / src / widgetprv.h

diff --git a/src/widgetprv.h b/src/widgetprv.h
index e88c4e6131ab46883bdd5a23d8fbe86646b95681..5df0976f8797eb6978d71197f34cd3302835ff74 100644 (file)
--- a/src/widgetprv.h
+++ b/src/widgetprv.h
@@ -1,6 +1,5 @@
 /* The emacs frame widget private header file.
-   Copyright (C) 1993, 2001, 2002, 2003, 2004, 2005,
-                 2006, 2007, 2008  Free Software Foundation, Inc.
+   Copyright (C) 1993, 2001-2011  Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
@@ -44,7 +43,7 @@ typedef struct {
   int          internal_border_width;  /* internal borders */
   int          interline;              /* skips between lines */
 
-  XFontStruct* font;                   /* font */
+  struct font* font;                   /* font */
   Pixel                foreground_pixel;       /* foreground */
 
   Pixel                cursor_color;           /* text cursor color */
@@ -77,5 +76,3 @@ extern EmacsFrameClassRec emacsFrameClassRec;  /* class pointer */
 
 #endif /* _EmacsFrameP_h */
 
-/* arch-tag: 2b579b4c-f697-4f86-b27a-35b7cb1a4a1c
-   (do not change this comment) */