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

* window.h (WGET, WSET): New macros similar to AREF and ASET.
* alloc.c, buffer.c, composite.c, dispextern.h, dispnew.c, editfns.c:
* fileio.c, font.c, fontset.c, frame.c, frame.h, fringe.c, indent.c:
* insdel.c, keyboard.c, keymap.c, lisp.h, minibuf.c, msdos.c, nsfns.m:
* nsmenu.m, nsterm.m, print.c, textprop.c, w32fns.c, w32menu.c:
* w32term.c, window.c, xdisp.c, xfaces.c, xfns.c, xmenu.c, xterm.c:
Adjust users.

1 files changed, 3 insertions, 3 deletions

diff --git a/src/keymap.c b/src/keymap.c
index bd2f3c99c26..a0a35285131 100644
--- a/src/keymap.c
+++ b/src/keymap.c
@@ -1560,8 +1560,8 @@ like in the respective argument of `key-binding'. */)
       window = POSN_WINDOW (position);
 
       if (WINDOWP (window)
-          && BUFFERP (WVAR (XWINDOW (window), buffer))
-          && XBUFFER (WVAR (XWINDOW (window), buffer)) != current_buffer)
+          && BUFFERP (WGET (XWINDOW (window), buffer))
+          && XBUFFER (WGET (XWINDOW (window), buffer)) != current_buffer)
         {
           /* Arrange to go back to the original buffer once we're done
              processing the key sequence.  We don't use
@@ -1573,7 +1573,7 @@ like in the respective argument of `key-binding'. */)
 
           record_unwind_protect (Fset_buffer, Fcurrent_buffer ());
 
-          set_buffer_internal (XBUFFER (WVAR (XWINDOW (window), buffer)));
+          set_buffer_internal (XBUFFER (WGET (XWINDOW (window), buffer)));
         }
     }