Merge from mainline.

[gnu-emacs] / src / widgetprv.h

diff --git a/src/widgetprv.h b/src/widgetprv.h
index 91a64c160250436712ede5788d9240c8875cd748..5df0976f8797eb6978d71197f34cd3302835ff74 100644 (file)
--- a/src/widgetprv.h
+++ b/src/widgetprv.h
@@ -1,12 +1,12 @@
 /* The emacs frame widget private header file.
-   Copyright (C) 1993 Free Software Foundation, Inc.
+   Copyright (C) 1993, 2001-2011  Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
-GNU Emacs is free software; you can redistribute it and/or modify
+GNU Emacs is free software: you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
-any later version.
+the Free Software Foundation, either version 3 of the License, or
+(at your option) any later version.
 
 GNU Emacs is distributed in the hope that it will be useful,
 but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -14,9 +14,7 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
-along with GNU Emacs; see the file COPYING.  If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA.  */
+along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 
 /* Emacs 19 face widget ported by Fred Pierresteguy */
 
@@ -38,14 +36,14 @@ typedef struct {
   /* The rest of this is crap and should be deleted.
    */
   int          minibuffer;     /* 0: normal frames with minibuffers.
-                                * 1: frames without minibuffers 
+                                * 1: frames without minibuffers
                                 * 2: minibuffer only. */
   Boolean      unsplittable;   /* frame can only have one window */
 
   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,3 +75,4 @@ extern EmacsFrameClassRec emacsFrameClassRec;  /* class pointer */
 
 
 #endif /* _EmacsFrameP_h */
+