- Fset_window_buffer (FGET (sf, minibuffer_window), buffer, Qnil);
- minibuf_window = FGET (sf, minibuffer_window);
+ /* Use set_window_buffer instead of Fset_window_buffer (see
+ discussion of bug#11984, bug#12025, bug#12026). */
+ set_window_buffer (sf->minibuffer_window, buffer, 0, 0);
+ minibuf_window = sf->minibuffer_window;