Separate read and write access to Lisp_Object slots of struct window.

[bpt/emacs.git] / src / xfaces.c

diff --git a/src/xfaces.c b/src/xfaces.c
index bdee8fd..ff9df49 100644 (file)
--- a/src/xfaces.c
+++ b/src/xfaces.c
@@ -6033,7 +6033,7 @@ face_at_buffer_position (struct window *w, ptrdiff_t pos,
                         ptrdiff_t *endptr, ptrdiff_t limit,
                         int mouse, int base_face_id)
 {
-  struct frame *f = XFRAME (WVAR (w, frame));
+  struct frame *f = XFRAME (WGET (w, frame));
   Lisp_Object attrs[LFACE_VECTOR_SIZE];
   Lisp_Object prop, position;
   ptrdiff_t i, noverlays;
@@ -6055,9 +6055,9 @@ face_at_buffer_position (struct window *w, ptrdiff_t pos,
 
   /* Get the `face' or `mouse_face' text property at POS, and
      determine the next position at which the property changes.  */
-  prop = Fget_text_property (position, propname, WVAR (w, buffer));
+  prop = Fget_text_property (position, propname, WGET (w, buffer));
   XSETFASTINT (limit1, (limit < endpos ? limit : endpos));
-  end = Fnext_single_property_change (position, propname, WVAR (w, buffer), limit1);
+  end = Fnext_single_property_change (position, propname, WGET (w, buffer), limit1);
   if (INTEGERP (end))
     endpos = XINT (end);
 
@@ -6143,7 +6143,7 @@ face_for_overlay_string (struct window *w, ptrdiff_t pos,
                         ptrdiff_t *endptr, ptrdiff_t limit,
                         int mouse, Lisp_Object overlay)
 {
-  struct frame *f = XFRAME (WVAR (w, frame));
+  struct frame *f = XFRAME (WGET (w, frame));
   Lisp_Object attrs[LFACE_VECTOR_SIZE];
   Lisp_Object prop, position;
   ptrdiff_t endpos;
@@ -6163,9 +6163,9 @@ face_for_overlay_string (struct window *w, ptrdiff_t pos,
 
   /* Get the `face' or `mouse_face' text property at POS, and
      determine the next position at which the property changes.  */
-  prop = Fget_text_property (position, propname, WVAR (w, buffer));
+  prop = Fget_text_property (position, propname, WGET (w, buffer));
   XSETFASTINT (limit1, (limit < endpos ? limit : endpos));
-  end = Fnext_single_property_change (position, propname, WVAR (w, buffer), limit1);
+  end = Fnext_single_property_change (position, propname, WGET (w, buffer), limit1);
   if (INTEGERP (end))
     endpos = XINT (end);