From: Alan Mackenzie <acm@muc.de>
To: martin rudalics <rudalics@gmx.at>
Cc: emacs-devel@gnu.org
Subject: Re: What is restore_window_configuration in read_minibuf (minibuf.c) for?
Date: Tue, 20 Apr 2021 13:38:11 +0000 [thread overview]
Message-ID: <YH7ZQ0QPrle1lRRf@ACM> (raw)
In-Reply-To: <53b9bf3a-bbf2-64e9-f71d-2ac7eb00ae16@gmx.at>
Hello, Martin.
On Mon, Apr 19, 2021 at 18:02:48 +0200, martin rudalics wrote:
> > So what seems needed is an extra &optional parameter to
> > set-window-configuration, DONT-SET-MINIWINDOW which would inhibit the
> > restoration of the mini-window. The call from unwinding a minibuffer
> > would pass a non-nil value for this argument. Messy, but I haven't got
> > any better ideas.
> > What do you think?
> You could probably also set the minibuffer window(s) separately to
> whatever you want after the configuration has been restored. It's messy
> in either case.
I've gone ahead with my original suggestion.
Also, I've added some proper error handling for a "can't happen" case in
read_minibuf_unwind, at that place where the loop around frames caused a
crash when there were tooltip frames involved. The error occurs if that
loop doesn't find the expired minibuffer in any frame.
If there are no objections, I intend to commit the following soon, which
fixes the bug:
diff --git a/doc/lispref/windows.texi b/doc/lispref/windows.texi
index c32d711f12..82d2ce4757 100644
--- a/doc/lispref/windows.texi
+++ b/doc/lispref/windows.texi
@@ -5877,7 +5877,7 @@ Window Configurations
@xref{Window Parameters}.
@end defun
-@defun set-window-configuration configuration &optional dont-set-frame
+@defun set-window-configuration configuration &optional dont-set-frame dont-set-miniwindow
This function restores the configuration of windows and buffers as
specified by @var{configuration}, for the frame that
@var{configuration} was created for, regardless of whether that frame
@@ -5885,8 +5885,12 @@ Window Configurations
that was previously returned by @code{current-window-configuration}
for that frame. Normally the function also selects the frame which is
recorded in the configuration, but if @var{dont-set-frame} is
-non-@code{nil}, it leaves selected the frame which was current at the
-start of the function.
+non-@code{nil}, it leaves selected the frame which was already
+selected at the start of the function.
+
+Normally the function restores the saved minibuffer (if any), but if
+@var{dont-set-miniwindow} is non-@code{nil}, the minibuffer current
+at the start of the function (if any) remains in the mini-window.
If the frame from which @var{configuration} was saved is dead, all
this function does is to restore the value of the variable
diff --git a/etc/NEWS b/etc/NEWS
index 3e5767c953..6cf1a98e5d 100644
--- a/etc/NEWS
+++ b/etc/NEWS
@@ -2660,9 +2660,11 @@ one to another in the init file. The same user option also controls
whether the function 'read-answer' accepts short answers.
+++
-** 'set-window-configuration' now takes an optional 'dont-set-frame'
-parameter which, when non-nil, instructs the function not to select
-the frame recorded in the configuration.
+** 'set-window-configuration' now takes two optional parameters,
+'dont-set-frame' and 'dont-set-miniwindow'. The first of these, when
+non-nil, instructs the function not to select the frame recorded in
+the configuration. The second prevents the current minibuffer being
+replaced by the one stored in the configuration.
+++
** 'define-globalized-minor-mode' now takes a ':predicate' parameter.
diff --git a/src/keyboard.c b/src/keyboard.c
index 266ebaa5fd..5db45ce8e5 100644
--- a/src/keyboard.c
+++ b/src/keyboard.c
@@ -2121,7 +2121,7 @@ read_char_help_form_unwind (void)
Lisp_Object window_config = XCAR (help_form_saved_window_configs);
help_form_saved_window_configs = XCDR (help_form_saved_window_configs);
if (!NILP (window_config))
- Fset_window_configuration (window_config, Qnil);
+ Fset_window_configuration (window_config, Qnil, Qnil);
}
#define STOP_POLLING \
diff --git a/src/minibuf.c b/src/minibuf.c
index b823224a5f..db62ae0eea 100644
--- a/src/minibuf.c
+++ b/src/minibuf.c
@@ -660,17 +660,14 @@ read_minibuf (Lisp_Object map, Lisp_Object initial, Lisp_Object prompt,
record_unwind_protect_void (minibuffer_unwind);
record_unwind_protect (restore_window_configuration,
- Fcons (Qt, Fcurrent_window_configuration (Qnil)));
+ 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))
record_unwind_protect (restore_window_configuration,
- Fcons (/* Arrange for the frame later to be
- switched back to the calling
- frame. */
- Qnil,
- Fcurrent_window_configuration (mini_frame)));
+ list3 (Fcurrent_window_configuration (mini_frame),
+ Qnil, Qt));
/* If the minibuffer is on an iconified or invisible frame,
make it visible now. */
@@ -1071,13 +1068,13 @@ read_minibuf_unwind (void)
goto found;
}
}
- return; /* expired minibuffer not found. Maybe we should output an
- error, here. */
+ exp_MB_frame = Qnil; /* "Can't happen." */
found:
- if (!EQ (exp_MB_frame, saved_selected_frame))
+ if (!EQ (exp_MB_frame, saved_selected_frame)
+ && !NILP (exp_MB_frame))
do_switch_frame (exp_MB_frame, 0, 0, Qt); /* This also sets
- minibuff_window */
+ minibuf_window */
/* To keep things predictable, in case it matters, let's be in the
minibuffer when we reset the relevant variables. Don't depend on
@@ -1187,7 +1184,8 @@ read_minibuf_unwind (void)
}
/* Restore the selected frame. */
- if (!EQ (exp_MB_frame, saved_selected_frame))
+ if (!EQ (exp_MB_frame, saved_selected_frame)
+ && !NILP (exp_MB_frame))
do_switch_frame (saved_selected_frame, 0, 0, Qt);
}
@@ -1202,6 +1200,7 @@ minibuffer_unwind (void)
Lisp_Object window;
Lisp_Object entry;
+ if (NILP (exp_MB_frame)) return; /* "Can't happen." */
f = XFRAME (exp_MB_frame);
window = f->minibuffer_window;
w = XWINDOW (window);
diff --git a/src/window.c b/src/window.c
index a22fab2444..5134c3df63 100644
--- a/src/window.c
+++ b/src/window.c
@@ -6881,19 +6881,22 @@ DEFUN ("window-configuration-frame", Fwindow_configuration_frame, Swindow_config
}
DEFUN ("set-window-configuration", Fset_window_configuration,
- Sset_window_configuration, 1, 2, 0,
+ Sset_window_configuration, 1, 3, 0,
doc: /* Set the configuration of windows and buffers as specified by CONFIGURATION.
CONFIGURATION must be a value previously returned
by `current-window-configuration' (which see).
Normally, this function selects the frame of the CONFIGURATION, but if
DONT-SET-FRAME is non-nil, it leaves selected the frame which was
-current at the start of the function.
+current at the start of the function. If DONT-SET-MINIWINDOW is non-nil,
+the mini-window of the frame doesn't get set to the corresponding element
+of CONFIGURATION.
If CONFIGURATION was made from a frame that is now deleted,
only frame-independent values can be restored. In this case,
the return value is nil. Otherwise the value is t. */)
- (Lisp_Object configuration, Lisp_Object dont_set_frame)
+ (Lisp_Object configuration, Lisp_Object dont_set_frame,
+ Lisp_Object dont_set_miniwindow)
{
register struct save_window_data *data;
struct Lisp_Vector *saved_windows;
@@ -7104,8 +7107,10 @@ the return value is nil. Otherwise the value is t. */)
}
}
- if (BUFFERP (p->buffer) && BUFFER_LIVE_P (XBUFFER (p->buffer)))
- /* If saved buffer is alive, install it. */
+ if ((NILP (dont_set_miniwindow) || !MINI_WINDOW_P (w))
+ && BUFFERP (p->buffer) && BUFFER_LIVE_P (XBUFFER (p->buffer)))
+ /* If saved buffer is alive, install it, unless it's a
+ minibuffer we explicitly prohibit. */
{
wset_buffer (w, p->buffer);
w->start_at_line_beg = !NILP (p->start_at_line_beg);
@@ -7258,9 +7263,11 @@ void
restore_window_configuration (Lisp_Object configuration)
{
if (CONSP (configuration))
- Fset_window_configuration (XCDR (configuration), XCAR (configuration));
+ Fset_window_configuration (XCAR (configuration),
+ XCAR (XCDR (configuration)),
+ XCAR (XCDR (XCDR (configuration))));
else
- Fset_window_configuration (configuration, Qnil);
+ Fset_window_configuration (configuration, Qnil, Qnil);
}
> martin
--
Alan Mackenzie (Nuremberg, Germany).
prev parent reply other threads:[~2021-04-20 13:38 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-04-19 10:46 What is restore_window_configuration in read_minibuf (minibuf.c) for? Alan Mackenzie
2021-04-19 12:08 ` martin rudalics
2021-04-19 14:56 ` Alan Mackenzie
2021-04-19 15:20 ` Daniel Mendler
2021-04-19 16:03 ` martin rudalics
2021-04-19 15:31 ` Stefan Monnier
2021-04-19 16:02 ` martin rudalics
2021-04-20 13:38 ` Alan Mackenzie [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=YH7ZQ0QPrle1lRRf@ACM \
--to=acm@muc.de \
--cc=emacs-devel@gnu.org \
--cc=rudalics@gmx.at \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this external index
https://git.savannah.gnu.org/cgit/emacs.git
https://git.savannah.gnu.org/cgit/emacs/org-mode.git
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.