mirrors/emacs
1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2026-01-08 12:40:49 -08:00
Code Issues Projects Releases Wiki Activity

Avoid two crashes involving windows on dead frames.

Browse source 
* window.c (Fwindow_absolute_pixel_edges)
(Fdelete_other_windows_internal): Signal an error if the window is
on a dead frame.

Fixes: debbugs:11984
This commit is contained in:
Chong Yidong 2012-07-19 11:33:08 +08:00
parent e32a12b5ec
commit 23dc774492
2 changed files with 10 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/ChangeLog
View file

@ -1,3 +1,9 @@
2012-07-19 Chong Yidong <cyd@gnu.org>
* window.c (Fwindow_absolute_pixel_edges)
(Fdelete_other_windows_internal): Signal an error if the window is
on a dead frame (Bug#11984).
2012-07-14 Eli Zaretskii <eliz@gnu.org>
Remove FILE_SYSTEM_CASE.

6
src/window.c
View file

@ -484,9 +484,7 @@ for future use. */)
(Lisp_Object window, Lisp_Object limit)
{
register struct window *w = decode_any_window (window);
w->combination_limit = limit;
return w->combination_limit;
}
@ -800,6 +798,8 @@ of just the text area, use `window-inside-absolute-pixel-edges'. */)
{
register struct window *w = decode_any_window (window);
int add_x, add_y;
CHECK_LIVE_FRAME (w->frame);
calc_absolute_offset (w, &add_x, &add_y);
return Fcons (make_number (WINDOW_LEFT_EDGE_X (w) + add_x),
@ -2568,6 +2568,7 @@ window-start value is reasonable when this function is called. */)
Mouse_HLInfo *hlinfo;
w = decode_any_window (window);
CHECK_LIVE_FRAME (w->frame);
XSETWINDOW (window, w);
f = XFRAME (w->frame);
@ -2581,6 +2582,7 @@ window-start value is reasonable when this function is called. */)
/* ROOT must be an ancestor of WINDOW. */
{
r = decode_any_window (root);
CHECK_LIVE_FRAME (r->frame);
pwindow = XWINDOW (window)->parent;
while (!NILP (pwindow))
if (EQ (pwindow, root))