1 files changed, 9 insertions, 9 deletions

diff --git a/src/buffer.c b/src/buffer.c
index 445f7bea263..6085746ee6e 100644
--- a/src/buffer.c
+++ b/src/buffer.c
@@ -1560,7 +1560,7 @@ cleaning up all windows currently displaying the buffer to be killed. */)
      since anything can happen within do_yes_or_no_p.  */
 
   /* Don't kill the minibuffer now current.  */
-  if (EQ (buffer, WVAR (XWINDOW (minibuf_window), buffer)))
+  if (EQ (buffer, WGET (XWINDOW (minibuf_window), buffer)))
     return Qnil;
 
   /* When we kill an ordinary buffer which shares it's buffer text
@@ -1611,7 +1611,7 @@ cleaning up all windows currently displaying the buffer to be killed. */)
   /* If the buffer now current is shown in the minibuffer and our buffer
      is the sole other buffer give up.  */
   XSETBUFFER (tem, current_buffer);
-  if (EQ (tem, WVAR (XWINDOW (minibuf_window), buffer))
+  if (EQ (tem, WGET (XWINDOW (minibuf_window), buffer))
       && EQ (buffer, Fother_buffer (buffer, Qnil, Qnil)))
     return Qnil;
 
@@ -2193,13 +2193,13 @@ DEFUN ("buffer-swap-text", Fbuffer_swap_text, Sbuffer_swap_text,
     while (NILP (Fmemq (w, ws)))
       {
         ws = Fcons (w, ws);
-        if (MARKERP (WVAR (XWINDOW (w), pointm))
-            && (EQ (WVAR (XWINDOW (w), buffer), buf1)
-                || EQ (WVAR (XWINDOW (w), buffer), buf2)))
-          Fset_marker (WVAR (XWINDOW (w), pointm),
+        if (MARKERP (WGET (XWINDOW (w), pointm))
+            && (EQ (WGET (XWINDOW (w), buffer), buf1)
+                || EQ (WGET (XWINDOW (w), buffer), buf2)))
+          Fset_marker (WGET (XWINDOW (w), pointm),
                        make_number
-                       (BUF_BEGV (XBUFFER (WVAR (XWINDOW (w), buffer)))),
-                       WVAR (XWINDOW (w), buffer));
+                       (BUF_BEGV (XBUFFER (WGET (XWINDOW (w), buffer)))),
+                       WGET (XWINDOW (w), buffer));
         w = Fnext_window (w, Qt, Qt);
       }
   }
@@ -3675,7 +3675,7 @@ modify_overlay (struct buffer *buf, ptrdiff_t start, ptrdiff_t end)
 
   /* If this is a buffer not in the selected window,
      we must do other windows.  */
-  if (buf != XBUFFER (WVAR (XWINDOW (selected_window), buffer)))
+  if (buf != XBUFFER (WGET (XWINDOW (selected_window), buffer)))
     windows_or_buffers_changed = 1;
   /* If multiple windows show this buffer, we must do other windows.  */
   else if (buffer_shared > 1)