* frame.c (delete_frame): Avoid unnecessary 'this_f' test.

Fixes: debbugs:14970

* frame.c (delete_frame): Avoid unnecessary 'this_f' test.
Fixes: debbugs:14970
e560aba9 · Paul Eggert · 2e5ce5de · e560aba9 · e560aba9
Commit e560aba9 authored Jul 28, 2013 by Paul Eggert
Hide whitespace changes
Inline Side-by-side

Showing with 10 additions and 5 deletions

src/ChangeLog src/ChangeLog +4 -0

src/frame.c src/frame.c +6 -5

No files found.
--- a/src/ChangeLog
+++ b/src/ChangeLog
+2013-07-28  Paul Eggert  <eggert@cs.ucla.edu>
+
+	* frame.c (delete_frame): Avoid unnecessary 'this_f' test (Bug#14970).
+
 2013-07-28  Eli Zaretskii  <eliz@gnu.org>

 	* w32fns.c (w32_wnd_proc) <WM_IME_STARTCOMPOSITION>: Make sure the

--- a/src/frame.c
+++ b/src/frame.c
@@ -1158,12 +1158,13 @@ delete_frame (Lisp_Object frame, Lisp_Object force)
      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'.  */