diff options
author | Alan Mackenzie <acm@muc.de> | 2021-04-22 12:07:21 +0000 |
---|---|---|
committer | Alan Mackenzie <acm@muc.de> | 2021-04-22 12:07:21 +0000 |
commit | 846989498b66f94739e78ca274c8d1176c137591 (patch) | |
tree | 02092f6327ae1f4b01fe51b1b9b0040d86fb248a /lisp/emacs-lisp/hierarchy.el | |
parent | 3021ecdedd3883911ca2db2357311f7fecdbd667 (diff) | |
download | emacs-846989498b66f94739e78ca274c8d1176c137591.tar.gz emacs-846989498b66f94739e78ca274c8d1176c137591.tar.bz2 emacs-846989498b66f94739e78ca274c8d1176c137591.zip |
Fix unclean "can't happen" error handling in read_minibuf_unwind
Also fix a bug where, with minibuffer-follows-selected-frame neither nil nor
t, a minibuffer could appear in two frames at the same time.
* src/window.c (Fset_window_configuration): Add a new &optional parameter
DONT-SET-MINIWINDOW, which inhibits the minibuffer from being restored from
the supplied window configuration.
(restore_window_configuration): Enhance to match the above.
* src/minibuf.c (read_minibuf): Enhance the argument list to the
restore_window_configuration calls to match the above. In the main case,
restoring the minibuffer is inhibited.
(read_minibuf_unwind): Should the frame with the expired minibuffer not be
found ("can't happen"), unwind the stacked data nevertheless, rather than just
exiting.
* src/keyboard.c (read_char_help_form_unwind): Amend a call of
Fset_window_configuration.
* doc/lispref/windows.texi (Window Configurations): Document the new form of
set-window-configuration.
* etc/NEWS (Lisp Changes in Emacs 28.1): Amend the entry for
set-window-configuration.
Diffstat (limited to 'lisp/emacs-lisp/hierarchy.el')
0 files changed, 0 insertions, 0 deletions