[Emacs-diffs] /srv/bzr/emacs/trunk r105688: Don't have previous and next buffers deal with internal windows.

[martin rudalics]

------------------------------------------------------------
revno: 105688
committer: martin rudalics <address@hidden>
branch nick: trunk
timestamp: Thu 2011-09-08 17:45:20 +0200
message:
  Don't have previous and next buffers deal with internal windows.
  
  * window.c (Fset_window_prev_buffers, Fset_window_next_buffers):
  Operate on live windows only.
  
  * window.el (window-deletable-p): Make sure window is live before
  invoking window-prev-buffers.
modified:
  lisp/ChangeLog
  lisp/window.el
  src/ChangeLog
  src/window.c

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2011-09-08 15:25:37 +0000
+++ b/lisp/ChangeLog    2011-09-08 15:45:20 +0000
@@ -1,3 +1,8 @@
+2011-09-08  Martin Rudalics  <address@hidden>
+
+       * window.el (window-deletable-p): Make sure window is live before
+       invoking window-prev-buffers.
+
 2011-09-08  Leo Liu  <address@hidden>
 
        * net/rcirc.el (rcirc-cmd-invite): New rcirc command.  (Bug#9453)

=== modified file 'lisp/window.el'
--- a/lisp/window.el    2011-09-08 06:28:37 +0000
+++ b/lisp/window.el    2011-09-08 15:45:20 +0000
@@ -2305,7 +2305,8 @@
         (dedicated (and (window-buffer window) (window-dedicated-p window)))
         ;; prev non-nil means there is another buffer we can show
         ;; in WINDOW instead.
-        (prev (and (window-prev-buffers window)
+        (prev (and (window-live-p window)
+                   (window-prev-buffers window)
                    (or (cdr (window-prev-buffers window))
                        (not (eq (caar (window-prev-buffers window))
                                 buffer))))))

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2011-09-08 10:59:22 +0000
+++ b/src/ChangeLog     2011-09-08 15:45:20 +0000
@@ -1,3 +1,8 @@
+2011-09-08  Martin Rudalics  <address@hidden>
+
+       * window.c (Fset_window_prev_buffers, Fset_window_next_buffers):
+       Operate on live windows only.
+
 2011-09-08  Juanma Barranquero  <address@hidden>
 
        * emacs.c (my_heap_start): #ifdef to avoid warnings when unused.

=== modified file 'src/window.c'
--- a/src/window.c      2011-09-04 18:46:51 +0000
+++ b/src/window.c      2011-09-08 15:45:20 +0000
@@ -1682,7 +1682,7 @@
 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 @@
 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,