--- a/src/window.h	Mon Aug 13 11:19:22 2007 +0200
+++ b/src/window.h	Mon Aug 13 11:20:41 2007 +0200
@@ -24,8 +24,8 @@
 
 /* Synched up with: FSF 19.30. */
 
-#ifndef INCLUDED_window_h_
-#define INCLUDED_window_h_
+#ifndef _XEMACS_WINDOW_H_
+#define _XEMACS_WINDOW_H_
 
 #include "redisplay.h"
 #ifdef HAVE_SCROLLBARS
@@ -129,15 +129,7 @@
   /* Number of columns display within the window is scrolled to the left. */
   int hscroll;
   /* Idem for the window's modeline */
-  Charcount modeline_hscroll;
-  /* Amount to clip off the top line for pixel-based scrolling. Point
-     will remain constant but this will be incremented to
-     incrementally shift lines up. */
-  int top_yoffset;
-  /* Amount to clip off the left of the lines for pixel-based
-     scrolling. Hscroll will remain constant but this will be
-     incremented to incrementally shift lines left.*/
-  int left_xoffset;
+  int modeline_hscroll;
   /* Number saying how recently window was selected */
   Lisp_Object use_time;
   /* text.modified of displayed buffer as of last time display completed */
@@ -184,9 +176,6 @@
      must run the redisplay-end-trigger-functions.  */
   Lisp_Object redisplay_end_trigger;
 
-  /* Set by the extent code when extents in the gutter are changed. */
-  int gutter_extent_modiff[4];
-
   /* Set by redisplay to the last position seen.  This is used
      to implement the redisplay-end-trigger-functions. */
   Bufpos last_redisplay_pos;
@@ -265,6 +254,7 @@
 #define XWINDOW(x) XRECORD (x, window, struct window)
 #define XSETWINDOW(x, p) XSETRECORD (x, p, window)
 #define WINDOWP(x) RECORDP (x, window)
+#define GC_WINDOWP(x) GC_RECORDP (x, window)
 #define CHECK_WINDOW(x) CHECK_RECORD (x, window)
 #define CONCHECK_WINDOW(x) CONCHECK_RECORD (x, window)
 
@@ -313,7 +303,7 @@
 EXFUN (Freplace_buffer_in_windows, 1);
 EXFUN (Fselect_window, 2);
 EXFUN (Fselected_window, 1);
-EXFUN (Fset_window_buffer, 3);
+EXFUN (Fset_window_buffer, 2);
 EXFUN (Fset_window_hscroll, 2);
 EXFUN (Fset_window_point, 2);
 EXFUN (Fset_window_start, 3);
@@ -339,8 +329,6 @@
 int window_displayed_height (struct window *);
 int window_is_leftmost (struct window *w);
 int window_is_rightmost (struct window *w);
-int window_is_lowest (struct window *w);
-int window_is_highest (struct window *w);
 int window_truncation_on (struct window *w);
 int window_needs_vertical_divider (struct window *);
 int window_scrollbar_width (struct window *w);
@@ -352,6 +340,7 @@
 int window_bottom_gutter_height (struct window *w);
 int window_left_gutter_width (struct window *w, int modeline);
 int window_right_gutter_width (struct window *w, int modeline);
+int window_bottom_toolbar_height (struct window *w);
 
 void delete_all_subwindows (struct window *w);
 void set_window_pixheight (Lisp_Object window, int pixheight,
@@ -363,8 +352,6 @@
 int buffer_window_count (struct buffer *b, struct frame *f);
 int buffer_window_mru (struct window *w);
 void check_frame_size (struct frame *frame, int *rows, int *cols);
-int frame_pixsize_valid_p (struct frame *frame, int width, int height);
-int frame_size_valid_p (struct frame *frame, int rows, int cols);
 struct window *decode_window (Lisp_Object window);
 struct window *find_window_by_pixel_pos (int pix_x, int pix_y, Lisp_Object win);
 
@@ -387,18 +374,13 @@
 int window_divider_width (struct window *w);
 
 #define WINDOW_FRAME(w) ((w)->frame)
-#define WINDOW_XFRAME(w) XFRAME (WINDOW_FRAME (w))
 #define WINDOW_BUFFER(w) ((w)->buffer)
-#define WINDOW_XBUFFER(w) XBUFFER (WINDOW_BUFFER (w))
 #define WINDOW_DEVICE(w) FRAME_DEVICE (XFRAME (WINDOW_FRAME (w)))
-#define WINDOW_XDEVICE(w) XDEVICE (WINDOW_DEVICE (w))
 #define WINDOW_CONSOLE(w) DEVICE_CONSOLE (XDEVICE (WINDOW_DEVICE (w)))
-#define WINDOW_XCONSOLE(w) XCONSOLE (WINDOW_CONSOLE (w))
 
 /* XEmacs window size and positioning macros. */
 #define WINDOW_TOP(w) ((w)->pixel_top)
 #define WINDOW_TEXT_TOP(w) (WINDOW_TOP (w) + window_top_gutter_height (w))
-#define WINDOW_TEXT_TOP_CLIP(w) ((w)->top_yoffset)
 #define WINDOW_BOTTOM(w) ((w)->pixel_top + (w)->pixel_height)
 #define WINDOW_TEXT_BOTTOM(w) (WINDOW_BOTTOM (w) - window_bottom_gutter_height (w))
 #define WINDOW_LEFT(w) ((w)->pixel_left)
@@ -434,4 +416,4 @@
 
 #endif /* emacs */
 
-#endif /* INCLUDED_window_h_ */
+#endif /* _XEMACS_WINDOW_H_ */