Fix Sed scripts and msdos.c as fallout of latest changes.

2 files changed, 13 insertions, 7 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index 9c5d7f083d5..3de5ad8b5ce 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,9 @@
+2012-08-04  Eli Zaretskii  <eliz@gnu.org>
+
+        * msdos.c (dos_set_window_size, IT_update_begin)
+        (IT_frame_up_to_date, IT_set_frame_parameters): Use FVAR and WVAR
+        instead of direct references.
+
 2012-08-04  Paul Eggert  <eggert@cs.ucla.edu>
 
         Export DEFAULT_REHASH_* to GDB.
diff --git a/src/msdos.c b/src/msdos.c
index d6a493a71d3..481526d935e 100644
--- a/src/msdos.c
+++ b/src/msdos.c
@@ -594,7 +594,7 @@ dos_set_window_size (int *rows, int *cols)
       Mouse_HLInfo *hlinfo = MOUSE_HL_INFO (f);
       Lisp_Object window = hlinfo->mouse_face_window;
 
-      if (! NILP (window) && XFRAME (XWINDOW (window)->frame) == f)
+      if (! NILP (window) && XFRAME (WVAR (XWINDOW (window), frame)) == f)
         {
           hlinfo->mouse_face_beg_row = hlinfo->mouse_face_beg_col = -1;
           hlinfo->mouse_face_end_row = hlinfo->mouse_face_end_col = -1;
@@ -1255,7 +1255,7 @@ IT_update_begin (struct frame *f)
           /* If the mouse highlight is in the window that was deleted
              (e.g., if it was popped by completion), clear highlight
              unconditionally.  */
-          if (NILP (w->buffer))
+          if (NILP (WVAR (w, buffer)))
             hlinfo->mouse_face_window = Qnil;
           else
             {
@@ -1265,7 +1265,7 @@ IT_update_begin (struct frame *f)
                   break;
             }
 
-          if (NILP (w->buffer) || i < w->desired_matrix->nrows)
+          if (NILP (WVAR (w, buffer)) || i < w->desired_matrix->nrows)
             clear_mouse_face (hlinfo);
         }
     }
@@ -1318,8 +1318,8 @@ IT_frame_up_to_date (struct frame *f)
      frame parameters.  For the selected window, we use either its
      buffer-local value or the value from the frame parameters if the
      buffer doesn't define its local value for the cursor type.  */
-  sw = XWINDOW (f->selected_window);
-  frame_desired_cursor = Fcdr (Fassq (Qcursor_type, f->param_alist));
+  sw = XWINDOW (FVAR (f, selected_window));
+  frame_desired_cursor = Fcdr (Fassq (Qcursor_type, FVAR (f, param_alist)));
   if (cursor_in_echo_area
       && FRAME_HAS_MINIBUF_P (f)
       && EQ (FRAME_MINIBUF_WINDOW (f), echo_area_window)
@@ -1327,7 +1327,7 @@ IT_frame_up_to_date (struct frame *f)
     new_cursor = frame_desired_cursor;
   else
     {
-      struct buffer *b = XBUFFER (sw->buffer);
+      struct buffer *b = XBUFFER (WVAR (sw, buffer));
 
       if (EQ (BVAR (b,cursor_type), Qt))
         new_cursor = frame_desired_cursor;
@@ -1598,7 +1598,7 @@ IT_set_frame_parameters (struct frame *f, Lisp_Object alist)
   Lisp_Object *values
     = (Lisp_Object *) alloca (length * sizeof (Lisp_Object));
   /* Do we have to reverse the foreground and background colors?  */
-  int reverse = EQ (Fcdr (Fassq (Qreverse, f->param_alist)), Qt);
+  int reverse = EQ (Fcdr (Fassq (Qreverse, FVAR (f, param_alist))), Qt);
   int redraw = 0, fg_set = 0, bg_set = 0;
   unsigned long orig_fg, orig_bg;
   struct tty_display_info *tty = FRAME_TTY (f);