Merge from origin/emacs-24

[gnu-emacs] / src / widgetprv.h

diff --git a/src/widgetprv.h b/src/widgetprv.h
index 5df0976f8797eb6978d71197f34cd3302835ff74..f5e2eb549a19ab5572836616b102f52e40b910c1 100644 (file)
--- a/src/widgetprv.h
+++ b/src/widgetprv.h
@@ -1,5 +1,5 @@
 /* The emacs frame widget private header file.
-   Copyright (C) 1993, 2001-2011  Free Software Foundation, Inc.
+   Copyright (C) 1993, 2001-2014 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
@@ -43,7 +43,6 @@ typedef struct {
   int          internal_border_width;  /* internal borders */
   int          interline;              /* skips between lines */
 
-  struct font* font;                   /* font */
   Pixel                foreground_pixel;       /* foreground */
 
   Pixel                cursor_color;           /* text cursor color */
@@ -70,9 +69,4 @@ typedef struct _EmacsFrameClassRec {  /* full class record declaration */
     EmacsFrameClassPart        emacs_frame_class;
 } EmacsFrameClassRec;
 
-extern EmacsFrameClassRec emacsFrameClassRec;   /* class pointer */
-
-
-
 #endif /* _EmacsFrameP_h */
-