Merge from emacs-24; up to 117691

[gnu-emacs] / src / widgetprv.h

diff --git a/src/widgetprv.h b/src/widgetprv.h
index 34ec3bfbfe8cb5b9934170fa6c2342a5553fffaa..f5e2eb549a19ab5572836616b102f52e40b910c1 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, 2009, 2010, 2011  Free Software Foundation, Inc.
+   Copyright (C) 1993, 2001-2014 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
@@ -44,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 */
@@ -71,11 +69,4 @@ typedef struct _EmacsFrameClassRec { /* full class record declaration */
     EmacsFrameClassPart        emacs_frame_class;
 } EmacsFrameClassRec;
 
-extern EmacsFrameClassRec emacsFrameClassRec;   /* class pointer */
-
-
-
 #endif /* _EmacsFrameP_h */
-
-/* arch-tag: 2b579b4c-f697-4f86-b27a-35b7cb1a4a1c
-   (do not change this comment) */