Merge from emacs-24; up to 2012-05-04T19:17:01Z!monnier@iro.umontreal.ca

[gnu-emacs] / src / xterm.h

diff --git a/src/xterm.h b/src/xterm.h
index 8919b648371bfe6060a11f1d5095d5d521e77a7d..86a76fd81a91a6c2b009efb312de34a4a9814251 100644 (file)
--- a/src/xterm.h
+++ b/src/xterm.h
@@ -736,9 +736,6 @@ enum
 /* This is the Colormap which frame F uses.  */
 #define FRAME_X_COLORMAP(f) FRAME_X_DISPLAY_INFO (f)->cmap
 
-/* This is the 'font_info *' which frame F has.  */
-#define FRAME_X_FONT_TABLE(f) (FRAME_X_DISPLAY_INFO (f)->font_table)
-
 /* The difference in pixels between the top left corner of the
    Emacs window (including possible window manager decorations)
    and FRAME_X_WINDOW (f).  */
@@ -937,10 +934,7 @@ void x_handle_property_notify (XPropertyEvent *);
 /* From xfns.c.  */
 
 struct frame *check_x_frame (Lisp_Object);
-EXFUN (Fx_display_grayscale_p, 1);
 extern void x_free_gcs (struct frame *);
-extern int gray_bitmap_width, gray_bitmap_height;
-extern char *gray_bitmap_bits;
 
 /* From xrdb.c.  */