summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authormartin rudalics <rudalics@gmx.at>2021-08-04 08:48:18 +0200
committerLars Ingebrigtsen <larsi@gnus.org>2021-08-04 08:48:18 +0200
commit51583a0f9f75950933a342a09ea3d317a528581e (patch)
treefb25d433334158f884c7ec545829f85763a06286 /src
parentbee3e51550174047c73a1e942c16c8d45e2db1b8 (diff)
downloademacs-51583a0f9f75950933a342a09ea3d317a528581e.tar.gz
Add new user option 'read-minibuffer-restore-windows'
* doc/lispref/minibuf.texi (Text from Minibuffer): Document it (bug#45072). * lisp/cus-start.el (standard): Add. * src/minibuf.c (syms_of_minibuf): New variable 'read-minibuffer-restore-windows'.
Diffstat (limited to 'src')
-rw-r--r--src/minibuf.c18
1 files changed, 15 insertions, 3 deletions
diff --git a/src/minibuf.c b/src/minibuf.c
index 0f4349e70b8..3ee0dca5e05 100644
--- a/src/minibuf.c
+++ b/src/minibuf.c
@@ -689,12 +689,15 @@ read_minibuf (Lisp_Object map, Lisp_Object initial, Lisp_Object prompt,
call1 (Qpush_window_buffer_onto_prev, minibuf_window);
record_unwind_protect_void (minibuffer_unwind);
- record_unwind_protect (restore_window_configuration,
- list3 (Fcurrent_window_configuration (Qnil), Qt, Qt));
+ if (read_minibuffer_restore_windows)
+ record_unwind_protect (restore_window_configuration,
+ list3 (Fcurrent_window_configuration (Qnil),
+ Qt, Qt));
/* If the minibuffer window is on a different frame, save that
frame's configuration too. */
- if (!EQ (mini_frame, selected_frame))
+ if (read_minibuffer_restore_windows &&
+ !EQ (mini_frame, selected_frame))
record_unwind_protect (restore_window_configuration,
list3 (Fcurrent_window_configuration (mini_frame),
Qnil, Qt));
@@ -2527,6 +2530,15 @@ for instance when running a headless Emacs server. Functions like
instead. */);
inhibit_interaction = 0;
+ DEFVAR_BOOL ("read-minibuffer-restore-windows", read_minibuffer_restore_windows,
+ doc: /* Non-nil means restore window configurations on exit from minibuffer.
+If this is non-nil (the default), reading input with the minibuffer will
+restore, on exit, the window configurations of the frame where the
+minibuffer was entered from and, if it is different, the frame that owns
+the associated minibuffer window. If this is nil, no such restorations
+are done. */);
+ read_minibuffer_restore_windows = true;
+
defsubr (&Sactive_minibuffer_window);
defsubr (&Sset_minibuffer_window);
defsubr (&Sread_from_minibuffer);