Don't change visibility of tty root frames (Bug#80032)

* src/frame.c (Fmake_frame_visible, Fmake_frame_invisible):
* doc/lispref/frames.texi (Visibility of Frames): Don't change
visibility of tty root frames.  (Bug#80032)

2 files changed, 15 insertions, 24 deletions

diff --git a/doc/lispref/frames.texi b/doc/lispref/frames.texi
index bc7c1e4915a..77b606282da 100644
--- a/doc/lispref/frames.texi
+++ b/doc/lispref/frames.texi
@@ -3391,13 +3391,10 @@ all child frames of @var{frame} (and their descendants) invisible too
 Unless @var{force} is non-@code{nil}, this function refuses to make
 @var{frame} invisible if all other frames are invisible.  On a text
 terminal this will make @var{frame} invisible if and only if it is a
-child frame or at least one other non-child frame (@pxref{Child Frames})
-on that terminal exists.  In the former case, if @var{frame} is
+child frame (@pxref{Child Frames}).  In this case, if @var{frame} is
 selected, it will select the first visible ancestor of @var{frame}
-instead.  In the latter case it will make another non-child frame on
-that terminal visible and the new top frame (@pxref{Frames}) of that
-terminal.  In either case, it will remove all child frames with
-@var{frame} as their ancestor from display.
+instead.  In addition, it will remove all child frames with @var{frame}
+as their ancestor from display.
 @end deffn
 
   The visibility status of a frame is also available as a frame
diff --git a/src/frame.c b/src/frame.c
index 131f1967424..49317379354 100644
--- a/src/frame.c
+++ b/src/frame.c
@@ -3366,7 +3366,7 @@ If omitted, FRAME defaults to the currently selected frame.  */)
   if (FRAME_WINDOW_P (f) && FRAME_TERMINAL (f)->frame_visible_invisible_hook)
     FRAME_TERMINAL (f)->frame_visible_invisible_hook (f, true);
 
-  if (is_tty_frame (f))
+  if (is_tty_child_frame (f))
     {
       SET_FRAME_VISIBLE (f, true);
       tty_raise_lower_frame (f, true);
@@ -3410,11 +3410,9 @@ Normally you may not make FRAME invisible if all other frames are
 invisible, but if the second optional argument FORCE is non-nil, you may
 do so.
 
-On a text terminal make FRAME invisible if and only FRAME is either a
-child frame or another non-child frame can be found.  In the former
-case, if FRAME is the selected frame, select the first visible ancestor
-of FRAME instead.  In the latter case, if FRAME is the top frame of its
-terminal, make another frame that terminal's top frame.  */)
+On a text terminal make FRAME invisible if and only if FRAME is a child
+frame.  If, in that case, FRAME is the selected frame, select the first
+visible ancestor of FRAME instead.  */)
   (Lisp_Object frame, Lisp_Object force)
 {
   struct frame *f = decode_live_frame (frame);
@@ -3427,18 +3425,14 @@ terminal, make another frame that terminal's top frame.  */)
   if (FRAME_WINDOW_P (f) && FRAME_TERMINAL (f)->frame_visible_invisible_hook)
     FRAME_TERMINAL (f)->frame_visible_invisible_hook (f, false);
 
-  SET_FRAME_VISIBLE (f, false);
-
-  if (is_tty_frame (f) && EQ (frame, selected_frame))
-  /* On a tty if FRAME is the selected frame, we have to select another
-    frame instead.  If FRAME is a child frame, use the first visible
-    ancestor as returned by 'mru_rooted_frame'.  If FRAME is a root
-    frame, use the frame returned by 'next-frame' which must exist since
-    otherwise other_frames above would have lied.  */
-    Fselect_frame (FRAME_PARENT_FRAME (f)
-                   ? mru_rooted_frame (f)
-                   : next_frame (frame, make_fixnum (0)),
-                   Qnil);
+  if (is_tty_child_frame (f) && EQ (frame, selected_frame))
+    {
+      SET_FRAME_VISIBLE (f, false);
+      /* If FRAME is a tty child frame and the selected frame, we have
+         to select another frame instead.  Use the first visible
+         ancestor as returned by 'mru_rooted_frame'.  */
+      Fselect_frame (mru_rooted_frame (f), Qnil);
+    }
 
   /* Make menu bar update for the Buffers and Frames menus.  */
   windows_or_buffers_changed = 16;