diff options
| author | Michael Albinus <michael.albinus@gmx.de> | 2020-11-25 12:18:23 +0100 |
|---|---|---|
| committer | Michael Albinus <michael.albinus@gmx.de> | 2020-11-25 12:18:23 +0100 |
| commit | e45ad6b08e1e6639dfcca28c1a496df5b676f985 (patch) | |
| tree | 08bfbeb47539732db7e22754d9e988c857279aaa /src/frame.c | |
| parent | fe5ffb73662d2402c42e16f81f7796194d2105a3 (diff) | |
| parent | 6442cdc0e4ec466841ff9c3d9016fecd7b72b5a1 (diff) | |
| download | emacs-e45ad6b08e1e6639dfcca28c1a496df5b676f985.tar.gz emacs-e45ad6b08e1e6639dfcca28c1a496df5b676f985.tar.bz2 emacs-e45ad6b08e1e6639dfcca28c1a496df5b676f985.zip | |
Merge from origin/emacs-27
6442cdc0e4 Revert extra focus redirection in do_switch_frame (Bug#24803)
fc4379f1ae Minor cleanup of tramp-tests.el on MS Windows
dea3d6aa18 Fix handling of defcustom :local tag
Diffstat (limited to 'src/frame.c')
| -rw-r--r-- | src/frame.c | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/src/frame.c b/src/frame.c index 512aaf5f45c..b33c521fb67 100644 --- a/src/frame.c +++ b/src/frame.c @@ -1426,11 +1426,15 @@ do_switch_frame (Lisp_Object frame, int track, int for_deletion, Lisp_Object nor if (FRAMEP (gfocus)) { focus = FRAME_FOCUS_FRAME (XFRAME (gfocus)); - if ((FRAMEP (focus) && XFRAME (focus) == SELECTED_FRAME ()) + if (FRAMEP (focus) && XFRAME (focus) == SELECTED_FRAME ()) /* Redirect frame focus also when FRAME has its minibuffer - window on the selected frame (see Bug#24500). */ + window on the selected frame (see Bug#24500). + + Don't do that: It causes redirection problem with a + separate minibuffer frame (Bug#24803) and problems + when updating the cursor on such frames. || (NILP (focus) - && EQ (FRAME_MINIBUF_WINDOW (f), sf->selected_window))) + && EQ (FRAME_MINIBUF_WINDOW (f), sf->selected_window))) */ Fredirect_frame_focus (gfocus, frame); } } |