diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/window.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/window.c b/src/window.c index c8fcb3a607f..2bce4c9723d 100644 --- a/src/window.c +++ b/src/window.c | |||
| @@ -556,7 +556,9 @@ select_window (Lisp_Object window, Lisp_Object norecord, | |||
| 556 | frame is active. */ | 556 | frame is active. */ |
| 557 | Fselect_frame (frame, norecord); | 557 | Fselect_frame (frame, norecord); |
| 558 | /* Fselect_frame called us back so we've done all the work already. */ | 558 | /* Fselect_frame called us back so we've done all the work already. */ |
| 559 | eassert (EQ (window, selected_window)); | 559 | eassert (EQ (window, selected_window) |
| 560 | || (EQ (window, f->minibuffer_window) | ||
| 561 | && NILP (Fminibufferp (XWINDOW (window)->contents, Qt)))); | ||
| 560 | return window; | 562 | return window; |
| 561 | } | 563 | } |
| 562 | else | 564 | else |