martin/emacs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source 
Fixes: debbugs:14970
This commit is contained in:
Paul Eggert
2013-07-28 21:36:23 +02:00
parent 2e5ce5ded7
commit e560aba9d1
2 changed files with 10 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/ChangeLog
View File

@@ -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

11
src/frame.c
View File

@@ -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'. */