From 0c94f256dc518bca9a0c8033270ac4b8f6a26b7a Mon Sep 17 00:00:00 2001 From: "Richard M. Stallman" Date: Tue, 22 Jul 1997 03:10:25 +0000 Subject: [PATCH] (choose_minibuf_frame_1): New function. (read_minibuf): Make an unwind protect to run that. (read_minibuf_unwind): Don't call choose_minibuf_frame here. --- src/minibuf.c | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/src/minibuf.c b/src/minibuf.c index e7888c0d7b8..a9ff9b84e70 100644 --- a/src/minibuf.c +++ b/src/minibuf.c @@ -148,6 +148,14 @@ choose_minibuf_frame () } } +Lisp_Object +choose_minibuf_frame_1 (ignore) + Lisp_Object ignore; +{ + choose_minibuf_frame (); + return Qnil; +} + DEFUN ("set-minibuffer-window", Fset_minibuffer_window, Sset_minibuffer_window, 1, 1, 0, "Specify which minibuffer window to use for the minibuffer.\n\ @@ -234,6 +242,8 @@ read_minibuf (map, initial, prompt, backup_n, expflag, choose_minibuf_frame (); + record_unwind_protect (choose_minibuf_frame_1, Qnil); + record_unwind_protect (Fset_window_configuration, Fcurrent_window_configuration (Qnil)); @@ -539,10 +549,6 @@ read_minibuf_unwind (data) unbind_to (count, Qnil); } - /* Make the minibuffer follow the selected frame - (in case we are exiting a recursive minibuffer). */ - choose_minibuf_frame (); - /* Make sure minibuffer window is erased, not ignored. */ windows_or_buffers_changed++; XSETFASTINT (XWINDOW (window)->last_modified, 0); -- 2.39.5