[Emacs-diffs] trunk r113577: * frame.c (delete_frame): Avoid unnecessary 'this_f' test.

[Paul Eggert]

------------------------------------------------------------
revno: 113577
revision-id: address@hidden
parent: address@hidden
fixes bug: http://debbugs.gnu.org/14970
committer: Paul Eggert <address@hidden>
branch nick: trunk
timestamp: Sun 2013-07-28 21:36:23 +0200
message:
  * frame.c (delete_frame): Avoid unnecessary 'this_f' test.
modified:
  src/ChangeLog                  changelog-20091113204419-o5vbwnq5f7feedwu-1438
  src/frame.c                    frame.c-20091113204419-o5vbwnq5f7feedwu-243

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2013-07-28 15:22:27 +0000
+++ b/src/ChangeLog     2013-07-28 19:36:23 +0000
@@ -1,3 +1,7 @@
+2013-07-28  Paul Eggert  <address@hidden>
+
+       * frame.c (delete_frame): Avoid unnecessary 'this_f' test (Bug#14970).
+
 2013-07-28  Eli Zaretskii  <address@hidden>
 
        * w32fns.c (w32_wnd_proc) <WM_IME_STARTCOMPOSITION>: Make sure the

=== modified file 'src/frame.c'
--- a/src/frame.c       2013-07-28 15:22:27 +0000
+++ b/src/frame.c       2013-07-28 19:36:23 +0000
@@ -1158,12 +1158,13 @@
       FOR_EACH_FRAME (frames, this)
        {
          Lisp_Object fminiw;
-         struct frame *this_f;
-
-         if (! EQ (this, frame)
-             && (this_f = XFRAME (this))
-             && WINDOWP (fminiw = FRAME_MINIBUF_WINDOW (this_f))
-             && EQ (frame, WINDOW_FRAME (XWINDOW (fminiw))))
+
+         if (EQ (this, frame))
+           continue;
+
+         fminiw = FRAME_MINIBUF_WINDOW (XFRAME (this));
+
+         if (WINDOWP (fminiw) && EQ (frame, WINDOW_FRAME (XWINDOW (fminiw))))
            {
              /* If we MUST delete this frame, delete the other first.
                 But do this only if FORCE equals `noelisp'.  */