1 files changed, 9 insertions, 1 deletions

diff --git a/src/xdisp.c b/src/xdisp.c
index 7c3885c975d..73edc0d7aaf 100644
--- a/src/xdisp.c
+++ b/src/xdisp.c
@@ -13508,11 +13508,15 @@ tab_bar_height (struct frame *f, int *n_rows, bool pixelwise)
                     0, 0, 0, STRING_MULTIBYTE (f->desired_tab_bar_string));
   it.paragraph_embedding = L2R;
 
+  clear_glyph_row (temp_row);
   while (!ITERATOR_AT_END_P (&it))
     {
-      clear_glyph_row (temp_row);
       it.glyph_row = temp_row;
       display_tab_bar_line (&it, -1);
+      /* If the tab-bar string includes newlines, get past it, because
+         display_tab_bar_line doesn't.  */
+      if (ITERATOR_AT_END_OF_LINE_P (&it))
+        set_iterator_to_next (&it, true);
     }
   clear_glyph_row (temp_row);
 
@@ -13638,6 +13642,10 @@ redisplay_tab_bar (struct frame *f)
               extra -= h;
             }
           display_tab_bar_line (&it, height + h);
+          /* If the tab-bar string includes newlines, get past it,
+             because display_tab_bar_line doesn't.  */
+          if (ITERATOR_AT_END_OF_LINE_P (&it))
+            set_iterator_to_next (&it, true);
         }
     }
   else