diff options
| author | Eli Zaretskii <eliz@gnu.org> | 2022-05-25 13:57:59 -0400 |
|---|---|---|
| committer | Eli Zaretskii <eliz@gnu.org> | 2022-05-25 13:57:59 -0400 |
| commit | 97bb31be9f4e06060f2d192b049c3cdb47aca2f5 (patch) | |
| tree | 1c7e537561f05e65f43689dc9603056f96962402 /src/minibuf.c | |
| parent | 9661c82920cf2b75300266bbd9da9e45b9471173 (diff) | |
| parent | 86b49d58652a8f59a3489bf15b367ec224e17ae7 (diff) | |
| download | emacs-97bb31be9f4e06060f2d192b049c3cdb47aca2f5.tar.gz emacs-97bb31be9f4e06060f2d192b049c3cdb47aca2f5.tar.bz2 emacs-97bb31be9f4e06060f2d192b049c3cdb47aca2f5.zip | |
Merge from origin/emacs-28
86b49d5865 ; * etc/NEWS: Announce changes in 'desktop-kill'. (Bug#55...
d5ccf2621a ; Fix last change
f1c1fd7184 Improve documentation of mail-user-agent.
b05d1e9b98 ; * lisp/desktop.el: Update the commentary. (Bug#55560)
139bfa1a08 More fixes in abbrev.el doc strings
d80dea6036 Add note about Tramp completion to completion-styles doc s...
9e7c0cf57d Remove mention of removed nnimap-nov-is-evil variable
90aae0bca2 Improve documentation strings and prompts in abbrev.el
dfa3e6f424 Restore the Fselect_window call in gui_consider_frame_title.
de35e9728f Advise against settings in the MS-Windows system registry
3ffa3d3403 ; Minor addition to make-tarball.txt
7dc026f9ea Fix kmacro-keymap binding after previous change
4f0fd54bc4 Add glossary entries for "interactively"
af1c05a3c4 Fix the name of a kmacro command.
# Conflicts:
# etc/NEWS
# lisp/abbrev.el
Diffstat (limited to 'src/minibuf.c')
| -rw-r--r-- | src/minibuf.c | 10 |
1 files changed, 1 insertions, 9 deletions
diff --git a/src/minibuf.c b/src/minibuf.c index 3f06ce7e0e3..79985b8d2bb 100644 --- a/src/minibuf.c +++ b/src/minibuf.c @@ -201,20 +201,12 @@ move_minibuffers_onto_frame (struct frame *of, bool for_deletion) return; if (FRAME_LIVE_P (f) && !EQ (f->minibuffer_window, of->minibuffer_window) - && WINDOW_LIVE_P (f->minibuffer_window) /* F not a tootip frame */ + && WINDOW_LIVE_P (f->minibuffer_window) /* F not a tooltip frame */ && WINDOW_LIVE_P (of->minibuffer_window)) { zip_minibuffer_stacks (f->minibuffer_window, of->minibuffer_window); if (for_deletion && XFRAME (MB_frame) != of) MB_frame = selected_frame; - if (!for_deletion - && MINI_WINDOW_P (XWINDOW (FRAME_SELECTED_WINDOW (of)))) - { - Lisp_Object old_frame; - XSETFRAME (old_frame, of); - Fset_frame_selected_window (old_frame, - Fframe_first_window (old_frame), Qnil); - } } } |