summaryrefslogtreecommitdiff
path: root/src/frame.c
diff options
context:
space:
mode:
authorAndreas Politz <politza@hochschule-trier.de>2013-09-29 10:33:23 +0200
committerMartin Rudalics <rudalics@gmx.at>2013-09-29 10:33:23 +0200
commitd3e2acb659b1ff5a7e71bceb960af75f33a9ee39 (patch)
treee29ecbe8bf16931cefdeb95736815ea88d524425 /src/frame.c
parent6cfe977d9f4cc0ac1321ef25a18c4f2a7d5fb9b1 (diff)
In delete_frame record selected frame only after calling Qdelete_frame_functions (Bug#15477).
* frame.c (delete_frame): Record selected frame only after calling Qdelete_frame_functions (Bug#15477).
Diffstat (limited to 'src/frame.c')
-rw-r--r--src/frame.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/frame.c b/src/frame.c
index 2e90713b6c..f7ba23401c 100644
--- a/src/frame.c
+++ b/src/frame.c
@@ -1190,7 +1190,7 @@ Lisp_Object
delete_frame (Lisp_Object frame, Lisp_Object force)
{
struct frame *f = decode_any_frame (frame);
- struct frame *sf = SELECTED_FRAME ();
+ struct frame *sf;
struct kboard *kb;
int minibuffer_selected, is_tooltip_frame;
@@ -1265,7 +1265,7 @@ delete_frame (Lisp_Object frame, Lisp_Object force)
There is no more chance for errors to prevent it. */
minibuffer_selected = EQ (minibuf_window, selected_window);
-
+ sf = SELECTED_FRAME ();
/* Don't let the frame remain selected. */
if (f == sf)
{