1 files changed, 33 insertions, 33 deletions

diff --git a/src/nvim/statusline.c b/src/nvim/statusline.c
index e868a79b9a..33c5c3a347 100644
--- a/src/nvim/statusline.c
+++ b/src/nvim/statusline.c
@@ -77,13 +77,14 @@ void win_redr_status(win_T *wp)
     width = is_stl_global ? Columns : wp->w_width;
 
     get_trans_bufname(wp->w_buffer);
-    p = NameBuff;
+    p = (char_u *)NameBuff;
     len = (int)STRLEN(p);
 
-    if (bt_help(wp->w_buffer)
-        || wp->w_p_pvw
-        || bufIsChanged(wp->w_buffer)
-        || wp->w_buffer->b_p_ro) {
+    if ((bt_help(wp->w_buffer)
+         || wp->w_p_pvw
+         || bufIsChanged(wp->w_buffer)
+         || wp->w_buffer->b_p_ro)
+        && len < MAXPATHL - 1) {
       *(p + len++) = ' ';
     }
     if (bt_help(wp->w_buffer)) {
@@ -100,7 +101,7 @@ void win_redr_status(win_T *wp)
     }
     if (wp->w_buffer->b_p_ro) {
       snprintf((char *)p + len, MAXPATHL - (size_t)len, "%s", _("[RO]"));
-      // len += (int)STRLEN(p + len);  // dead assignment
+      // len += (int)strlen(p + len);  // dead assignment
     }
 
     this_ru_col = ru_col - (Columns - width);
@@ -132,14 +133,14 @@ void win_redr_status(win_T *wp)
 
     row = is_stl_global ? (Rows - (int)p_ch - 1) : W_ENDROW(wp);
     col = is_stl_global ? 0 : wp->w_wincol;
-    grid_puts(&default_grid, p, row, col, attr);
+    grid_puts(&default_grid, (char *)p, row, col, attr);
     grid_fill(&default_grid, row, row + 1, len + col,
               this_ru_col + col, fillchar, fillchar, attr);
 
     if (get_keymap_str(wp, "<%s>", (char *)NameBuff, MAXPATHL)
-        && this_ru_col - len > (int)(STRLEN(NameBuff) + 1)) {
+        && this_ru_col - len > (int)(strlen(NameBuff) + 1)) {
       grid_puts(&default_grid, NameBuff, row,
-                (int)((size_t)this_ru_col - STRLEN(NameBuff) - 1), attr);
+                (int)((size_t)this_ru_col - strlen(NameBuff) - 1), attr);
     }
 
     win_redr_ruler(wp, true);
@@ -266,7 +267,7 @@ void win_redr_ruler(win_T *wp, bool always)
       off = 0;
     }
 
-    if (!part_of_status && !ui_has_messages()) {
+    if (!part_of_status && p_ch == 0 && !ui_has(kUIMessages)) {
       return;
     }
 
@@ -286,7 +287,7 @@ void win_redr_ruler(win_T *wp, bool always)
     vim_snprintf(buffer, RULER_BUF_LEN, "%" PRId64 ",",
                  (wp->w_buffer->b_ml.ml_flags &
                   ML_EMPTY) ? (int64_t)0L : (int64_t)wp->w_cursor.lnum);
-    size_t len = STRLEN(buffer);
+    size_t len = strlen(buffer);
     col_print(buffer + len, RULER_BUF_LEN - len,
               empty_line ? 0 : (int)wp->w_cursor.col + 1,
               (int)virtcol + 1);
@@ -294,7 +295,7 @@ void win_redr_ruler(win_T *wp, bool always)
     // Add a "50%" if there is room for it.
     // On the last line, don't print in the last column (scrolls the
     // screen up on some terminals).
-    int i = (int)STRLEN(buffer);
+    int i = (int)strlen(buffer);
     get_rel_pos(wp, buffer + i + 1, RULER_BUF_LEN - i - 1);
     int o = i + vim_strsize(buffer + i + 1);
     if (wp->w_status_height == 0 && !is_stl_global) {  // can't use last char of screen
@@ -342,9 +343,9 @@ void win_redr_ruler(win_T *wp, bool always)
       }
 
       ScreenGrid *grid = part_of_status ? &default_grid : &msg_grid_adj;
-      grid_puts(grid, (char_u *)buffer, row, this_ru_col + off, attr);
+      grid_puts(grid, buffer, row, this_ru_col + off, attr);
       grid_fill(grid, row, row + 1,
-                this_ru_col + off + (int)STRLEN(buffer), off + width, fillchar,
+                this_ru_col + off + (int)strlen(buffer), off + width, fillchar,
                 fillchar, attr);
     }
 
@@ -426,7 +427,7 @@ void win_redr_custom(win_T *wp, bool draw_winbar, bool draw_ruler)
   int len;
   int fillchar;
   char buf[MAXPATHL];
-  char_u *stl;
+  char *stl;
   char *p;
   stl_hlrec_t *hltab;
   StlClickRecord *tabtab;
@@ -455,7 +456,7 @@ void win_redr_custom(win_T *wp, bool draw_winbar, bool draw_ruler)
     maxwidth = Columns;
     use_sandbox = was_set_insecurely(wp, "tabline", 0);
   } else if (draw_winbar) {
-    stl = (char_u *)((*wp->w_p_wbr != NUL) ? wp->w_p_wbr : p_wbr);
+    stl = ((*wp->w_p_wbr != NUL) ? wp->w_p_wbr : p_wbr);
     row = -1;  // row zero is first row of text
     col = 0;
     grid = &wp->w_grid;
@@ -497,7 +498,7 @@ void win_redr_custom(win_T *wp, bool draw_winbar, bool draw_ruler)
         if (*++stl == '-') {
           stl++;
         }
-        if (atoi((char *)stl)) {
+        if (atoi(stl)) {
           while (ascii_isdigit(*stl)) {
             stl++;
           }
@@ -544,9 +545,9 @@ void win_redr_custom(win_T *wp, bool draw_winbar, bool draw_ruler)
 
   // Make a copy, because the statusline may include a function call that
   // might change the option value and free the memory.
-  stl = vim_strsave(stl);
+  stl = xstrdup(stl);
   width =
-    build_stl_str_hl(ewp, buf, sizeof(buf), (char *)stl, use_sandbox,
+    build_stl_str_hl(ewp, buf, sizeof(buf), stl, use_sandbox,
                      fillchar, maxwidth, &hltab, &tabtab);
   xfree(stl);
   ewp->w_p_crb = p_crb_save;
@@ -571,8 +572,8 @@ void win_redr_custom(win_T *wp, bool draw_winbar, bool draw_ruler)
   p = buf;
   for (n = 0; hltab[n].start != NULL; n++) {
     int textlen = (int)(hltab[n].start - p);
-    grid_puts_len(grid, (char_u *)p, textlen, row, col, curattr);
-    col += vim_strnsize((char_u *)p, textlen);
+    grid_puts_len(grid, p, textlen, row, col, curattr);
+    col += vim_strnsize(p, textlen);
     p = hltab[n].start;
 
     if (hltab[n].userhl == 0) {
@@ -586,8 +587,7 @@ void win_redr_custom(win_T *wp, bool draw_winbar, bool draw_ruler)
     }
   }
   // Make sure to use an empty string instead of p, if p is beyond buf + len.
-  grid_puts(grid, p >= buf + len ? (char_u *)"" : (char_u *)p, row, col,
-            curattr);
+  grid_puts(grid, p >= buf + len ? "" : p, row, col, curattr);
 
   grid_puts_line_flush(false);
 
@@ -608,7 +608,7 @@ void win_redr_custom(win_T *wp, bool draw_winbar, bool draw_ruler)
     .type = kStlClickDisabled,
   };
   for (n = 0; tabtab[n].start != NULL; n++) {
-    len += vim_strnsize((char_u *)p, (int)(tabtab[n].start - p));
+    len += vim_strnsize(p, (int)(tabtab[n].start - p));
     while (col < len) {
       click_defs[col++] = cur_click_def;
     }
@@ -712,13 +712,13 @@ int build_stl_str_hl(win_T *wp, char *out, size_t outlen, char *fmt, int use_san
   }
 
   // Get line & check if empty (cursorpos will show "0-1").
-  const char *line_ptr = (char *)ml_get_buf(wp->w_buffer, lnum, false);
+  const char *line_ptr = ml_get_buf(wp->w_buffer, lnum, false);
   bool empty_line = (*line_ptr == NUL);
 
   // Get the byte value now, in case we need it below. This is more
   // efficient than making a copy of the line.
   int byteval;
-  const size_t len = STRLEN(line_ptr);
+  const size_t len = strlen(line_ptr);
   if (wp->w_cursor.col > (colnr_T)len) {
     // Line may have changed since checking the cursor column, or the lnum
     // was adjusted above.
@@ -1191,8 +1191,8 @@ int build_stl_str_hl(win_T *wp, char *out, size_t outlen, char *fmt, int use_san
           && strchr((const char *)str, '%') != NULL
           && evaldepth < MAX_STL_EVAL_DEPTH) {
         size_t parsed_usefmt = (size_t)(block_start - usefmt);
-        size_t str_length = STRLEN(str);
-        size_t fmt_length = STRLEN(fmt_p);
+        size_t str_length = strlen(str);
+        size_t fmt_length = strlen(fmt_p);
         size_t new_fmt_len = parsed_usefmt + str_length + fmt_length + 3;
         char *new_fmt = xmalloc(new_fmt_len * sizeof(char));
         char *new_fmt_p = new_fmt;
@@ -1329,7 +1329,7 @@ int build_stl_str_hl(win_T *wp, char *out, size_t outlen, char *fmt, int use_san
       // in the temporary buffer
       // (including the brackets and null terminating character)
       if (*wp->w_buffer->b_p_ft != NUL
-          && STRLEN(wp->w_buffer->b_p_ft) < TMPLEN - 3) {
+          && strlen(wp->w_buffer->b_p_ft) < TMPLEN - 3) {
         vim_snprintf(buf_tmp, sizeof(buf_tmp), "[%s]",
                      wp->w_buffer->b_p_ft);
         str = buf_tmp;
@@ -1342,7 +1342,7 @@ int build_stl_str_hl(win_T *wp, char *out, size_t outlen, char *fmt, int use_san
       // in the temporary buffer
       // (including the comma and null terminating character)
       if (*wp->w_buffer->b_p_ft != NUL
-          && STRLEN(wp->w_buffer->b_p_ft) < TMPLEN - 2) {
+          && strlen(wp->w_buffer->b_p_ft) < TMPLEN - 2) {
         vim_snprintf(buf_tmp, sizeof(buf_tmp), ",%s", wp->w_buffer->b_p_ft);
         // Uppercase the file extension
         for (char *t = buf_tmp; *t != 0; t++) {
@@ -1562,7 +1562,7 @@ int build_stl_str_hl(win_T *wp, char *out, size_t outlen, char *fmt, int use_san
 
       // Advance the output buffer position to the end of the
       // number we just printed
-      out_p += STRLEN(out_p);
+      out_p += strlen(out_p);
 
       // Otherwise, there was nothing to print so mark the item as empty
     } else {
@@ -1670,7 +1670,7 @@ int build_stl_str_hl(win_T *wp, char *out, size_t outlen, char *fmt, int use_san
 
       if (width + 1 < maxwidth) {
         // Advance the pointer to the end of the string
-        trunc_p = trunc_p + STRLEN(trunc_p);
+        trunc_p = trunc_p + strlen(trunc_p);
       }
 
       // Fill up for half a double-wide character.
@@ -1706,7 +1706,7 @@ int build_stl_str_hl(win_T *wp, char *out, size_t outlen, char *fmt, int use_san
     // add characters at the separate marker (if there is one) to
     // fill up the available space.
   } else if (width < maxwidth
-             && STRLEN(out) + (size_t)(maxwidth - width) + 1 < outlen) {
+             && strlen(out) + (size_t)(maxwidth - width) + 1 < outlen) {
     // Find how many separators there are, which we will use when
     // figuring out how many groups there are.
     int num_separators = 0;