1 files changed, 8 insertions, 8 deletions

diff --git a/src/nvim/screen.c b/src/nvim/screen.c
index b0bf3a7d5f..baa4d83bbf 100644
--- a/src/nvim/screen.c
+++ b/src/nvim/screen.c
@@ -4890,7 +4890,7 @@ win_redr_status_matches (
     screen_puts(buf, row, 0, attr);
     if (selstart != NULL && highlight) {
       *selend = NUL;
-      screen_puts(selstart, row, selstart_col, hl_attr(HLF_WM));
+      screen_puts(selstart, row, selstart_col, HL_ATTR(HLF_WM));
     }
 
     screen_fill(row, row + 1, clen, (int)Columns, fillchar, fillchar, attr);
@@ -5155,7 +5155,7 @@ win_redr_custom (
     stl = p_tal;
     row = 0;
     fillchar = ' ';
-    attr = hl_attr(HLF_TPF);
+    attr = HL_ATTR(HLF_TPF);
     maxwidth = Columns;
     use_sandbox = was_set_insecurely((char_u *)"tabline", 0);
   } else {
@@ -5568,7 +5568,7 @@ static void update_window_hl(win_T *wp, bool invalid)
     wp->w_hl_attr_normal = 0;
   }
   if (wp != curwin) {
-    wp->w_hl_attr_normal = hl_combine_attr(hl_attr(HLF_INACTIVE),
+    wp->w_hl_attr_normal = hl_combine_attr(HL_ATTR(HLF_INACTIVE),
                                            wp->w_hl_attr_normal);
   }
 
@@ -5577,7 +5577,7 @@ static void update_window_hl(win_T *wp, bool invalid)
     if (wp->w_hl_ids[hlf] > 0) {
       attr = syn_id2attr(wp->w_hl_ids[hlf]);
     } else {
-      attr = hl_attr(hlf);
+      attr = HL_ATTR(hlf);
     }
     if (wp->w_hl_attr_normal != 0) {
       attr = hl_combine_attr(wp->w_hl_attr_normal, attr);
@@ -6654,7 +6654,7 @@ int showmode(void)
 
     /* Position on the last line in the window, column 0 */
     msg_pos_mode();
-    attr = hl_attr(HLF_CM);                     /* Highlight mode */
+    attr = HL_ATTR(HLF_CM);                     // Highlight mode
     if (do_mode) {
       MSG_PUTS_ATTR("--", attr);
       // CTRL-X in Insert mode
@@ -6802,7 +6802,7 @@ void clearmode(void)
 {
     msg_pos_mode();
     if (Recording) {
-      recording_mode(hl_attr(HLF_CM));
+      recording_mode(HL_ATTR(HLF_CM));
     }
     msg_clr_eos();
 }
@@ -6833,8 +6833,8 @@ static void draw_tabline(void)
   int modified;
   int c;
   int len;
-  int attr_nosel = hl_attr(HLF_TP);
-  int attr_fill = hl_attr(HLF_TPF);
+  int attr_nosel = HL_ATTR(HLF_TP);
+  int attr_fill = HL_ATTR(HLF_TPF);
   char_u      *p;
   int room;
   int use_sep_chars = (t_colors < 8