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

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).
d3e2acb6 · Andreas Politz · Martin Rudalics · 6cfe977d · d3e2acb6 · d3e2acb6
Commit d3e2acb6 authored Sep 29, 2013 by Andreas Politz Committed by Martin Rudalics Sep 29, 2013
Show whitespace changes
Inline Side-by-side

Showing with 7 additions and 2 deletions

src/ChangeLog src/ChangeLog +5 -0

src/frame.c src/frame.c +2 -2

No files found.
--- a/src/ChangeLog
+++ b/src/ChangeLog
+2013-09-29  Andreas Politz  <politza@hochschule-trier.de>  (tiny change)
+
+	* frame.c (delete_frame): Record selected frame only after
+	calling Qdelete_frame_functions (Bug#15477).
+
 2013-09-28  Jan Djärv  <jan.h.d@swipnet.se>

 	* nsterm.m (ns_selection_color): Remove.

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