mirrors/emacs
1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2025-12-30 17:10:51 -08:00
Code Issues Projects Releases Wiki Activity

Don't have previous and next buffers deal with internal windows.

Browse source 
* 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.
This commit is contained in:
Martin Rudalics 2011-09-08 17:45:20 +02:00
parent 567457e31a
commit 9b1c252e29
4 changed files with 14 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

5
lisp/ChangeLog
View file

@ -1,3 +1,8 @@
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)

3
lisp/window.el
View file

@ -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))))))

5
src/ChangeLog
View file

@ -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.

4
src/window.c
View file

@ -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,