2 files changed, 7 insertions, 2 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index a4c985b1a0c..bc3cbaa1282 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+2011-09-08  Martin Rudalics  <rudalics@gmx.at>
+
+        * window.c (Fset_window_prev_buffers, Fset_window_next_buffers):
+        Operate on live windows only.
+
 2011-09-08  Juanma Barranquero  <lekktu@gmail.com>
 
         * emacs.c (my_heap_start): #ifdef to avoid warnings when unused.
diff --git a/src/window.c b/src/window.c
index e3850387a64..0473ed4e3eb 100644
--- a/src/window.c
+++ b/src/window.c
@@ -1682,7 +1682,7 @@ PREV-BUFFERS should be either nil or a list of <buffer, window-start,
 window-point> triples where buffer was previously shown in WINDOW.  */)
      (Lisp_Object window, Lisp_Object prev_buffers)
 {
-  return decode_any_window (window)->prev_buffers = prev_buffers;
+  return decode_window (window)->prev_buffers = prev_buffers;
 }
 
 DEFUN ("window-next-buffers", Fwindow_next_buffers, Swindow_next_buffers,
@@ -1704,7 +1704,7 @@ NEXT-BUFFERS should be either nil or a list of buffers that have been
 recently re-shown in WINDOW.  */)
      (Lisp_Object window, Lisp_Object next_buffers)
 {
-  return decode_any_window (window)->next_buffers = next_buffers;
+  return decode_window (window)->next_buffers = next_buffers;
 }
 
 DEFUN ("window-parameters", Fwindow_parameters, Swindow_parameters,