# HG changeset patch
# User Karl Heuer <kwzh@gnu.org>
# Date 781273831 0
# Node ID f4fa46f6a032adeb6e9190d9d51057543dd3ed85
# Parent  05b2bd5d55599915fcc227cc4c265dac856405f2
(Fminibuffer_window, Fwindow_at, Fwindow_end, Fnext_window, Fprevious_window,
Fdisplay_buffer, Frecenter, Fmove_to_window_line,
Fcurrent_window_configuration): Use new accessor macros instead of calling
XSET directly.

diff -r 05b2bd5d5559 -r f4fa46f6a032 src/window.c
--- a/src/window.c	Tue Oct 04 12:28:40 1994 +0000
+++ b/src/window.c	Tue Oct 04 12:30:31 1994 +0000
@@ -161,7 +161,7 @@
 {
 #ifdef MULTI_FRAME
   if (NILP (frame))
-    XSET (frame, Lisp_Frame, selected_frame);
+    XSETFRAME (frame, selected_frame);
   else
     CHECK_LIVE_FRAME (frame, 0);
 #endif
@@ -446,7 +446,7 @@
 
 #ifdef MULTI_FRAME
   if (NILP (frame))
-    XSET (frame, Lisp_Frame, selected_frame);
+    XSETFRAME (frame, selected_frame);
   else
     CHECK_LIVE_FRAME (frame, 2);
 #endif
@@ -522,8 +522,8 @@
     return Qnil;
 #endif
 
-  XSET (value, Lisp_Int,
-	BUF_Z (XBUFFER (buf)) - XFASTINT (w->window_end_pos));
+  XSETINT (value,
+	   BUF_Z (XBUFFER (buf)) - XFASTINT (w->window_end_pos));
 
   return value;
 }
@@ -953,7 +953,7 @@
 		   If that happens, go back to the selected frame
 		   so we can complete the cycle.  */
 		if (EQ (tem, tem1))
-		  XSET (tem, Lisp_Frame, selected_frame);
+		  XSETFRAME (tem, selected_frame);
 	      }
 #endif
 	    tem = FRAME_ROOT_WINDOW (XFRAME (tem));
@@ -1097,7 +1097,7 @@
 		   If that happens, go back to the selected frame
 		   so we can complete the cycle.  */
 		if (EQ (tem, tem1))
-		  XSET (tem, Lisp_Frame, selected_frame);
+		  XSETFRAME (tem, selected_frame);
 	      }
 #endif
 	    /* If this frame has a minibuffer, find that window first,
@@ -1905,7 +1905,7 @@
       frames = Qnil;      
 #ifdef MULTI_FRAME
       if (FRAME_MINIBUF_ONLY_P (selected_frame))
-	XSET (frames, Lisp_Frame, last_nonminibuf_frame);
+	XSETFRAME (frames, last_nonminibuf_frame);
 #endif
       /* Don't try to create a window if would get an error */
       if (split_height_threshold < window_min_height << 1)
@@ -2652,7 +2652,7 @@
   if (XINT (n) < 0)
     XSETINT (n, XINT (n) + ht);
 
-  XSET (window, Lisp_Window, w);
+  XSETWINDOW (window, w);
   pos = *vmotion (point, - XINT (n), window_internal_width (w) - 1,
 		  XINT (w->hscroll), window);
 
@@ -2689,7 +2689,7 @@
     }
 
   start = marker_position (w->start);
-  XSET (window, Lisp_Window, w);
+  XSETWINDOW (window, w);
   if (start < BEGV || start > ZV)
     {
       Fvertical_motion (make_number (- (height / 2)), window);
@@ -3127,15 +3127,15 @@
   XFASTINT (data->frame_height) = FRAME_HEIGHT (f);
   XFASTINT (data->frame_menu_bar_lines) = FRAME_MENU_BAR_LINES (f);
 #ifdef MULTI_FRAME
-  XSET (data->selected_frame, Lisp_Frame, selected_frame);
+  XSETFRAME (data->selected_frame, selected_frame);
 #endif
   data->current_window = FRAME_SELECTED_WINDOW (f);
-  XSET (data->current_buffer, Lisp_Buffer, current_buffer);
+  XSETBUFFER (data->current_buffer, current_buffer);
   data->minibuf_scroll_window = Vminibuf_scroll_window;
   data->root_window = FRAME_ROOT_WINDOW (f);
   data->focus_frame = FRAME_FOCUS_FRAME (f);
-  XSET (data->min_height, Lisp_Int, window_min_height);
-  XSET (data->min_width, Lisp_Int, window_min_width);
+  XSETINT (data->min_height, window_min_height);
+  XSETINT (data->min_width, window_min_width);
   tem = Fmake_vector (make_number (n_windows), Qnil);
   data->saved_windows = tem;
   for (i = 0; i < n_windows; i++)
@@ -3143,7 +3143,7 @@
       = Fmake_vector (make_number (SAVED_WINDOW_VECTOR_SIZE), Qnil);
   save_window_save (FRAME_ROOT_WINDOW (f),
 		    XVECTOR (tem), 0);
-  XSET (tem, Lisp_Window_Configuration, data);
+  XSETWINDOW_CONFIGURATION (tem, data);
   return (tem);
 }