diff options
| author | Paul Eggert <eggert@cs.ucla.edu> | 2013-07-28 21:36:23 +0200 |
|---|---|---|
| committer | Paul Eggert <eggert@cs.ucla.edu> | 2013-07-28 21:36:23 +0200 |
| commit | e560aba9d13100bf448e14e5fceeddf1df2e4705 (patch) | |
| tree | 858785b10570ea7c8450407cb08d0e3f4c949fcb /src | |
| parent | 2e5ce5ded73aa084e12b826fd1adbebd03f900fd (diff) | |
* frame.c (delete_frame): Avoid unnecessary 'this_f' test.
Fixes: debbugs:14970
Diffstat (limited to 'src')
| -rw-r--r-- | src/ChangeLog | 4 | ||||
| -rw-r--r-- | src/frame.c | 11 |
2 files changed, 10 insertions, 5 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index c5448fd1514..8d6d34a83ae 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,7 @@ +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 diff --git a/src/frame.c b/src/frame.c index 0b59b43a445..95f53569561 100644 --- 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'. */ |