[Emacs-diffs] trunk r114479: In delete_frame record selected frame only after calling Qdelete_frame_functions (Bug#15477).

[Martin Rudalics]

------------------------------------------------------------
revno: 114479
revision-id: address@hidden
parent: address@hidden
author: Andreas Politz  <address@hidden>
committer: martin rudalics <address@hidden>
branch nick: trunk
timestamp: Sun 2013-09-29 10:33:23 +0200
message:
  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).
modified:
  src/ChangeLog                  changelog-20091113204419-o5vbwnq5f7feedwu-1438
  src/frame.c                    frame.c-20091113204419-o5vbwnq5f7feedwu-243

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2013-09-28 10:01:50 +0000
+++ b/src/ChangeLog     2013-09-29 08:33:23 +0000
@@ -1,3 +1,8 @@
+2013-09-29  Andreas Politz  <address@hidden>  (tiny change)
+
+       * frame.c (delete_frame): Record selected frame only after
+       calling Qdelete_frame_functions (Bug#15477).
+
 2013-09-28  Jan Djärv  <address@hidden>
 
        * nsterm.m (ns_selection_color): Remove.

=== modified file 'src/frame.c'
--- a/src/frame.c       2013-09-23 09:50:47 +0000
+++ b/src/frame.c       2013-09-29 08:33:23 +0000
@@ -1190,7 +1190,7 @@
 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 @@
      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)
     {