emacs-29 b14bbd108e: Improve handling of tab-bar height.

[Gregory Heytings]

branch: emacs-29
commit b14bbd108e4bc43f8c7995dfff4c2c59c78f1b5f
Author: Gregory Heytings <gregory@heytings.org>
Commit: Gregory Heytings <gregory@heytings.org>

    Improve handling of tab-bar height.
    
    * src/xdisp.c (redisplay_tab_bar): When 'auto-resize-tab-bar' is
    not 'grow-only', also consider the case when the tab-bar height
    needs to shrink.  Fixes bug#60210.
---
 src/xdisp.c | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/xdisp.c b/src/xdisp.c
index ea2d11e8b4..c9b3b187fe 100644
--- a/src/xdisp.c
+++ b/src/xdisp.c
@@ -14271,12 +14271,14 @@ redisplay_tab_bar (struct frame *f)
        frame_default_tab_bar_height = new_height;
     }
 
-  /* If new_height or new_nrows indicate that we need to enlarge the
-     tab-bar window, we can return right away.  */
+  /* If new_height or new_nrows indicate that we need to enlarge or
+     shrink the tab-bar window, we can return right away.  */
   if (new_nrows > f->n_tab_bar_rows
       || (EQ (Vauto_resize_tab_bars, Qgrow_only)
          && !f->minimize_tab_bar_window_p
-         && new_height > WINDOW_PIXEL_HEIGHT (w)))
+         && new_height > WINDOW_PIXEL_HEIGHT (w))
+      || (! EQ (Vauto_resize_tab_bars, Qgrow_only)
+         && new_height < WINDOW_PIXEL_HEIGHT (w)))
     {
       if (FRAME_TERMINAL (f)->change_tab_bar_height_hook)
        FRAME_TERMINAL (f)->change_tab_bar_height_hook (f, new_height);