A better fix for tab-line mouse highlight on TTY frames

* src/dispnew.c (mode_line_string):
* src/xdisp.c (note_mode_line_or_margin_highlight): Remove
recently-added workarounds for incorrect TTY mouse highlight:
they are no longer needed.
(mark_window_display_accurate_1): Set the header_line_p and
tab_line_p flags of the window's current_matrix if the window
displays these.
(display_mode_line): Set the header_line_p and tab_line_p
flags of the window's desired_matrix if the window displays
these.  (Bug#37807)

1 files changed, 1 insertions, 9 deletions

diff --git a/src/dispnew.c b/src/dispnew.c
index 47bf3c26cb2..4cdc76f5bcf 100644
--- a/src/dispnew.c
+++ b/src/dispnew.c
@@ -5517,15 +5517,7 @@ mode_line_string (struct window *w, enum window_part part,
   else if (part == ON_TAB_LINE)
     row = MATRIX_TAB_LINE_ROW (w->current_matrix);
   else
-    {
-      row = MATRIX_HEADER_LINE_ROW (w->current_matrix);
-      /* On TTY frames the matrix's tab_line_p flag is not set
-         (FIXME!), so we need to adjust by hand.  */
-      if (!FRAME_WINDOW_P (XFRAME (w->frame))
-          && window_wants_tab_line (w))
-
-        row++;
-    }
+    row = MATRIX_HEADER_LINE_ROW (w->current_matrix);
   y0 = *y - row->y;
   *y = row - MATRIX_FIRST_TEXT_ROW (w->current_matrix);