(Fplist_get): Rename arg `val' to `plist' as in doc.

[gnu-emacs] / src / xterm.h

diff --git a/src/xterm.h b/src/xterm.h
index 7b5f890fa4fdc5ae7a98bd81e69d5833bece7119..e0f59440734e26d76ee4bcc5b8c00d44dd0bf68c 100644 (file)
--- a/src/xterm.h
+++ b/src/xterm.h
@@ -24,11 +24,6 @@ the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.  */
 #include <X11/Xatom.h>
 #include <X11/Xresource.h>
 
-#ifdef HAVE_X11R5
-#define HAVE_X_I18N
-#include <X11/Xlocale.h>
-#endif
-
 #ifdef USE_X_TOOLKIT
 #include <X11/StringDefs.h>
 #include <X11/IntrinsicP.h>    /* CoreP.h needs this */
@@ -83,6 +78,11 @@ the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.  */
 #define HAVE_X11R4
 #endif
 #endif
+
+#ifdef HAVE_X11R5
+#define HAVE_X_I18N
+#include <X11/Xlocale.h>
+#endif
 \f
 #define BLACK_PIX_DEFAULT(f) BlackPixel (FRAME_X_DISPLAY (f), \
                                         XScreenNumberOfScreen (FRAME_X_SCREEN (f)))
@@ -511,6 +511,8 @@ struct x_output
 #define FRAME_FOREGROUND_PIXEL(f) ((f)->output_data.x->foreground_pixel)
 #define FRAME_BACKGROUND_PIXEL(f) ((f)->output_data.x->background_pixel)
 #define FRAME_FONT(f) ((f)->output_data.x->font)
+#define FRAME_INTERNAL_BORDER_WIDTH(f) ((f)->output_data.x->internal_border_width)
+#define FRAME_LINE_HEIGHT(f) ((f)->output_data.x->line_height)
 
 /* This gives the x_display_info structure for the display F is on.  */
 #define FRAME_X_DISPLAY_INFO(f) ((f)->output_data.x->display_info)
@@ -527,7 +529,7 @@ struct x_output
 
 #define FRAME_DESIRED_CURSOR(f) ((f)->output_data.x->desired_cursor)
 
-#define FRAME_XIC(f) ((f)->display.x->xic)
+#define FRAME_XIC(f) ((f)->output_data.x->xic)
 \f
 /* X-specific scroll bar stuff.  */
 
@@ -706,6 +708,7 @@ struct selection_input_event
 {
   int kind;
   Display *display;
+  /* We spell it with an "o" here because X does.  */
   Window requestor;
   Atom selection, target, property;
   Time time;
@@ -713,6 +716,7 @@ struct selection_input_event
 
 #define SELECTION_EVENT_DISPLAY(eventp)        \
   (((struct selection_input_event *) (eventp))->display)
+/* We spell it with an "o" here because X does.  */
 #define SELECTION_EVENT_REQUESTOR(eventp)      \
   (((struct selection_input_event *) (eventp))->requestor)
 #define SELECTION_EVENT_SELECTION(eventp)      \