diff options
| author | Paul Eggert | 2013-07-28 21:36:23 +0200 |
|---|---|---|
| committer | Paul Eggert | 2013-07-28 21:36:23 +0200 |
| commit | e560aba9d13100bf448e14e5fceeddf1df2e4705 (patch) | |
| tree | 858785b10570ea7c8450407cb08d0e3f4c949fcb /src/frame.c | |
| parent | 2e5ce5ded73aa084e12b826fd1adbebd03f900fd (diff) | |
| download | emacs-e560aba9d13100bf448e14e5fceeddf1df2e4705.tar.gz emacs-e560aba9d13100bf448e14e5fceeddf1df2e4705.zip | |
* frame.c (delete_frame): Avoid unnecessary 'this_f' test.
Fixes: debbugs:14970
Diffstat (limited to 'src/frame.c')
| -rw-r--r-- | src/frame.c | 11 |
1 files changed, 6 insertions, 5 deletions
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) | |||
| 1158 | FOR_EACH_FRAME (frames, this) | 1158 | FOR_EACH_FRAME (frames, this) |
| 1159 | { | 1159 | { |
| 1160 | Lisp_Object fminiw; | 1160 | Lisp_Object fminiw; |
| 1161 | struct frame *this_f; | ||
| 1162 | 1161 | ||
| 1163 | if (! EQ (this, frame) | 1162 | if (EQ (this, frame)) |
| 1164 | && (this_f = XFRAME (this)) | 1163 | continue; |
| 1165 | && WINDOWP (fminiw = FRAME_MINIBUF_WINDOW (this_f)) | 1164 | |
| 1166 | && EQ (frame, WINDOW_FRAME (XWINDOW (fminiw)))) | 1165 | fminiw = FRAME_MINIBUF_WINDOW (XFRAME (this)); |
| 1166 | |||
| 1167 | if (WINDOWP (fminiw) && EQ (frame, WINDOW_FRAME (XWINDOW (fminiw)))) | ||
| 1167 | { | 1168 | { |
| 1168 | /* If we MUST delete this frame, delete the other first. | 1169 | /* If we MUST delete this frame, delete the other first. |
| 1169 | But do this only if FORCE equals `noelisp'. */ | 1170 | But do this only if FORCE equals `noelisp'. */ |