mirror of
https://git.savannah.gnu.org/git/emacs.git
synced 2026-09-10 07:46:51 -04:00
Check for killed buffer when leaving minibuffer (Bug#81828)
* src/minibuf.c (read_minibuf): Check if the old current buffer was killed before trying to restore it when leaving the minibuffer.
This commit is contained in:
parent
bfdc20a1c4
commit
8268065404
|
|
@ -670,8 +670,9 @@ read_minibuf (Lisp_Object map, Lisp_Object initial, Lisp_Object prompt,
|
||||||
/* Choose the minibuffer window and frame, and take action on them. */
|
/* Choose the minibuffer window and frame, and take action on them. */
|
||||||
|
|
||||||
/* Prepare for restoring the current buffer since choose_minibuf_frame
|
/* Prepare for restoring the current buffer since choose_minibuf_frame
|
||||||
calling Fset_frame_selected_window may change it (Bug#12766). */
|
calling Fset_frame_selected_window may change it (Bug#12766). Make
|
||||||
record_unwind_protect (restore_buffer, Fcurrent_buffer ());
|
sure the current buffer is still live at that time (Bug#81828). */
|
||||||
|
record_unwind_current_buffer ();
|
||||||
|
|
||||||
choose_minibuf_frame ();
|
choose_minibuf_frame ();
|
||||||
mini_frame = WINDOW_FRAME (XWINDOW (minibuf_window));
|
mini_frame = WINDOW_FRAME (XWINDOW (minibuf_window));
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue