Use macros from dispextern.h where appropriate.

 src/xdisp.c (display_tool_bar_line, redisplay_tool_bar)
 (redisplay_internal, set_cursor_from_row, try_window)
 (try_window_id, dump_glyph_row, extend_face_to_end_of_line)
 (display_line, notice_overwritten_cursor)
 (mouse_face_from_buffer_pos, note_mouse_highlight): Use
 MATRIX_ROW_DISPLAYS_TEXT_P.
 (note_mouse_highlight): Use MATRIX_ROW_GLYPH_START.
 (mouse_face_from_string_pos, fast_find_string_pos): Use
 MATRIX_ROW_VPOS.
 src/xfns.c (Fx_show_tip): Use MATRIX_ROW_DISPLAYS_TEXT_P.
 src/w32fns.c (Fx_show_tip): Use MATRIX_ROW_DISPLAYS_TEXT_P.
 src/xdisp.c (try_cursor_movement): Use MATRIX_ROW and
 MATRIX_MODE_LINE_ROW.
 src/dispnew.c (update_window): Use MATRIX_ROW and MATRIX_MODE_LINE_ROW.

1 files changed, 2 insertions, 2 deletions

diff --git a/src/w32fns.c b/src/w32fns.c
index 6fd980c6b70..56cc1f37d08 100644
--- a/src/w32fns.c
+++ b/src/w32fns.c
@@ -5824,7 +5824,7 @@ Text larger than the specified size is clipped.  */)
       int row_width;
 
       /* Stop at the first empty row at the end.  */
-      if (!row->enabled_p || !row->displays_text_p)
+      if (!row->enabled_p || !MATRIX_ROW_DISPLAYS_TEXT_P (row))
         break;
 
       /* Let the row go over the full width of the frame.  */
@@ -5885,7 +5885,7 @@ Text larger than the specified size is clipped.  */)
           struct glyph *last;
           int row_width;
 
-          if (!row->enabled_p || !row->displays_text_p)
+          if (!row->enabled_p || !MATRIX_ROW_DISPLAYS_TEXT_P (row))
             break;
           row->full_width_p = 1;
           row_width = row->pixel_width;