diff options
| author | Alan Mackenzie | 2022-08-19 15:06:38 +0000 |
|---|---|---|
| committer | Alan Mackenzie | 2022-08-19 15:06:38 +0000 |
| commit | 9c0eec4ed86713519819b2e33dc3fff23f0e5f3d (patch) | |
| tree | 6b80e45ff3d8ff3bfdc23dbdd3f60946d4e5f79a /src | |
| parent | 16dfe04be2c57fc82ccdd56cad97b39d559a5afe (diff) | |
| download | emacs-9c0eec4ed86713519819b2e33dc3fff23f0e5f3d.tar.gz emacs-9c0eec4ed86713519819b2e33dc3fff23f0e5f3d.zip | |
* src/window.c (select_window): Fix assert for buffer = non-active minibuffer
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 2576b66a181..35ec2a1f908 100644 --- a/src/window.c +++ b/src/window.c | |||
| @@ -554,7 +554,9 @@ select_window (Lisp_Object window, Lisp_Object norecord, | |||
| 554 | frame is active. */ | 554 | frame is active. */ |
| 555 | Fselect_frame (frame, norecord); | 555 | Fselect_frame (frame, norecord); |
| 556 | /* Fselect_frame called us back so we've done all the work already. */ | 556 | /* Fselect_frame called us back so we've done all the work already. */ |
| 557 | eassert (EQ (window, selected_window)); | 557 | eassert (EQ (window, selected_window) |
| 558 | || (EQ (window, f->minibuffer_window) | ||
| 559 | && NILP (Fminibufferp (XWINDOW (window)->contents, Qt)))); | ||
| 558 | return window; | 560 | return window; |
| 559 | } | 561 | } |
| 560 | else | 562 | else |