diff options
| author | Xue Fuqiao | 2013-07-30 08:29:09 +0800 |
|---|---|---|
| committer | Xue Fuqiao | 2013-07-30 08:29:09 +0800 |
| commit | d2067333246b676fcf98567d34eec79ed4648d5f (patch) | |
| tree | ad6543d8e7f1db50226907f7278373eef544d252 /src/frame.c | |
| parent | 7aa7fff0c8860b72a2c7cdc7d4d0845245754d43 (diff) | |
| parent | 86b192c1479d167c13edb9cdaa026c231c8a0442 (diff) | |
| download | emacs-d2067333246b676fcf98567d34eec79ed4648d5f.tar.gz emacs-d2067333246b676fcf98567d34eec79ed4648d5f.zip | |
Merge from mainline.
Diffstat (limited to 'src/frame.c')
| -rw-r--r-- | src/frame.c | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/src/frame.c b/src/frame.c index 5fa54052cd2..95f53569561 100644 --- a/src/frame.c +++ b/src/frame.c | |||
| @@ -1157,10 +1157,14 @@ delete_frame (Lisp_Object frame, Lisp_Object force) | |||
| 1157 | 1157 | ||
| 1158 | FOR_EACH_FRAME (frames, this) | 1158 | FOR_EACH_FRAME (frames, this) |
| 1159 | { | 1159 | { |
| 1160 | if (! EQ (this, frame) | 1160 | Lisp_Object fminiw; |
| 1161 | && EQ (frame, | 1161 | |
| 1162 | WINDOW_FRAME (XWINDOW | 1162 | if (EQ (this, frame)) |
| 1163 | (FRAME_MINIBUF_WINDOW (XFRAME (this)))))) | 1163 | continue; |
| 1164 | |||
| 1165 | fminiw = FRAME_MINIBUF_WINDOW (XFRAME (this)); | ||
| 1166 | |||
| 1167 | if (WINDOWP (fminiw) && EQ (frame, WINDOW_FRAME (XWINDOW (fminiw)))) | ||
| 1164 | { | 1168 | { |
| 1165 | /* If we MUST delete this frame, delete the other first. | 1169 | /* If we MUST delete this frame, delete the other first. |
| 1166 | But do this only if FORCE equals `noelisp'. */ | 1170 | But do this only if FORCE equals `noelisp'. */ |