Commit 9b1c252e authored by Martin Rudalics's avatar Martin Rudalics
Browse files

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.
parent 567457e3
2011-09-08 Martin Rudalics <rudalics@gmx.at>
* window.el (window-deletable-p): Make sure window is live before
invoking window-prev-buffers.
2011-09-08 Leo Liu <sdl.web@gmail.com>
* net/rcirc.el (rcirc-cmd-invite): New rcirc command. (Bug#9453)
......
......@@ -2305,7 +2305,8 @@ its buffer or has no previous buffer to show instead."
(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))))))
......
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.
......
......@@ -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,
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment