Mercurial > emacs
diff src/window.c @ 100632:389db2f016a4
* frame.c (delete_frame): New function derived from
Fdelete_frame to handle Qnoelisp value for FORCE argument.
Delete last frame iff FORCE equals Qnoelisp. (Bug#1450)
(Fdelete_frame): Call delete_frame. Remove line from doc-string
saying that FORCE non-nil doesn't run `delete-frame-functions'.
* frame.h: Extern delete_frame.
* window.c (window_loop):
* terminal.c (delete_terminal):
* xterm.c (x_connection_closed):
* xfns.c (Fx_hide_tip):
* w32fns.c (Fx_hide_tip): Call delete_frame instead of
Fdelete_frame.
| author | Martin Rudalics <rudalics@gmx.at> |
|---|---|
| date | Mon, 22 Dec 2008 09:40:33 +0000 |
| parents | b06d87fbe42d |
| children | 2cf5314ee101 |
line wrap: on
line diff
--- a/src/window.c Mon Dec 22 01:30:31 2008 +0000 +++ b/src/window.c Mon Dec 22 09:40:33 2008 +0000 @@ -2273,7 +2273,7 @@ windows = XCDR (windows); /* Now we can safely delete the frame. */ - Fdelete_frame (w->frame, Qnil); + delete_frame (w->frame, Qnil); } else if (NILP (w->parent)) { @@ -2334,7 +2334,7 @@ windows = XCDR (windows); /* Now we can safely delete the frame. */ - Fdelete_frame (w->frame, Qnil); + delete_frame (w->frame, Qnil); } else if (!NILP (w->dedicated) && !NILP (w->parent)) { @@ -6909,7 +6909,7 @@ int (* fn) P_ ((struct window *, void *)); void *user_data; { - /* Fdelete_frame may set FRAME_ROOT_WINDOW (f) to Qnil. */ + /* delete_frame may set FRAME_ROOT_WINDOW (f) to Qnil. */ if (WINDOWP (FRAME_ROOT_WINDOW (f))) foreach_window_1 (XWINDOW (FRAME_ROOT_WINDOW (f)), fn, user_data); }