diff --git a/src/ChangeLog b/src/ChangeLog
index 894d80c877f..19db11870fe 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+2000-02-25  Gerd Moellmann  <gerd@gnu.org>
+
+	* window.c (Fset_window_buffer): Set WINDOW to the window
+	after decoding.
+
 2000-02-24  Gerd Moellmann  <gerd@gnu.org>
 
 	* xterm.c (x_display_and_set_cursor): Display cursor of
diff --git a/src/window.c b/src/window.c
index 631ea058e90..bdc0c6c1bc0 100644
--- a/src/window.c
+++ b/src/window.c
@@ -2439,6 +2439,7 @@ BUFFER can be a buffer or buffer name.")
   register Lisp_Object tem;
   register struct window *w = decode_window (window);
 
+  XSETWINDOW (window, w);
   buffer = Fget_buffer (buffer);
   CHECK_BUFFER (buffer, 1);