Merge from emacs-24; up to 117691

[gnu-emacs] / src / widgetprv.h

diff --git a/src/widgetprv.h b/src/widgetprv.h
index 997a70e026cfd1fe1875c5239242b55f0b1326f8..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 */