diff options
| author | Stefan Kangas <stefankangas@gmail.com> | 2022-08-19 17:30:18 +0200 |
|---|---|---|
| committer | Stefan Kangas <stefankangas@gmail.com> | 2022-08-19 17:30:18 +0200 |
| commit | d0bb333efc0faf4c8ee78db5bd9c99819ad2053b (patch) | |
| tree | c54ae69463ec66dc50c247c30330c7e3d54eb5aa /src | |
| parent | 986440aaad0b8f6ca1e8b93ec7eee3485644a648 (diff) | |
| parent | f2c0fb2615f4c1140f5eef52b19cb77b4e86cbb4 (diff) | |
| download | emacs-d0bb333efc0faf4c8ee78db5bd9c99819ad2053b.tar.gz | |
Merge from origin/emacs-28
f2c0fb2615 Resurrect obsoletion warning for two functions
9c0eec4ed8 * src/window.c (select_window): Fix assert for buffer = no...
16dfe04be2 Find libgccjit on macOS with Homebrew differently
# Conflicts:
# etc/NEWS
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, frame is active. */ Fselect_frame (frame, norecord); /* Fselect_frame called us back so we've done all the work already. */ - eassert (EQ (window, selected_window)); + eassert (EQ (window, selected_window) + || (EQ (window, f->minibuffer_window) + && NILP (Fminibufferp (XWINDOW (window)->contents, Qt)))); return window; } else |