diff options
author | Richard M. Stallman <[email protected]> | 1995-07-21 07:50:50 +0000 |
---|---|---|
committer | Richard M. Stallman <[email protected]> | 1995-07-21 07:50:50 +0000 |
commit | c5b6b68020dbea06f1b167553e4145319689492d (patch) | |
tree | a6c9fde76e7a497df70ba8ab3ebb8d55f4ae9c42 /src | |
parent | 2bb07400c9d0f4c796f8e213c733debe8cafe7aa (diff) |
(read_minibuf): Call choose_minibuffer_frame.
First save the previous minibuf_window.
(read_minibuf_unwind): Restore old minibuf_window.
Diffstat (limited to 'src')
-rw-r--r-- | src/minibuf.c | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/src/minibuf.c b/src/minibuf.c index 91e622a617..afd27c76a3 100644 --- a/src/minibuf.c +++ b/src/minibuf.c @@ -148,26 +148,28 @@ read_minibuf (map, initial, prompt, backup_n, expflag, histvar, histpos) if (!enable_recursive_minibuffers && minibuf_level > 0 && (EQ (selected_window, minibuf_window))) -#if 0 - || selected_frame != XFRAME (WINDOW_FRAME (XWINDOW (minibuf_window))) -#endif error ("Command attempted to use minibuffer while in minibuffer"); /* Could we simply bind these variables instead? */ minibuf_save_list + = Fcons (Voverriding_local_map, + Fcons (minibuf_window, minibuf_save_list)); + minibuf_save_list = Fcons (minibuf_prompt, Fcons (make_number (minibuf_prompt_width), Fcons (Vhelp_form, Fcons (Vcurrent_prefix_arg, Fcons (Vminibuffer_history_position, Fcons (Vminibuffer_history_variable, - Fcons (Voverriding_local_map, - minibuf_save_list))))))); + minibuf_save_list)))))); + minibuf_prompt_width = 0; /* xdisp.c puts in the right value. */ minibuf_prompt = Fcopy_sequence (prompt); Vminibuffer_history_position = histpos; Vminibuffer_history_variable = histvar; + choose_minibuf_frame (); + record_unwind_protect (Fset_window_configuration, Fcurrent_window_configuration (Qnil)); @@ -407,6 +409,8 @@ read_minibuf_unwind (data) minibuf_save_list = Fcdr (minibuf_save_list); Voverriding_local_map = Fcar (minibuf_save_list); minibuf_save_list = Fcdr (minibuf_save_list); + minibuf_window = Fcar (minibuf_save_list); + minibuf_save_list = Fcdr (minibuf_save_list); } |