diff options
Diffstat (limited to 'src/nvim/statusline.c')
-rw-r--r-- | src/nvim/statusline.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/nvim/statusline.c b/src/nvim/statusline.c index 7d8394e1b4..6857bef810 100644 --- a/src/nvim/statusline.c +++ b/src/nvim/statusline.c @@ -1502,7 +1502,7 @@ int build_stl_str_hl(win_T *wp, char *out, size_t outlen, char *fmt, char *opt_n case STL_LINE: // Overload %l with v:lnum for 'statuscolumn' - num = strcmp(opt_name, "statuscolumn") == 0 ? get_vim_var_nr(VV_LNUM) + num = opt_name != NULL && strcmp(opt_name, "statuscolumn") == 0 ? get_vim_var_nr(VV_LNUM) : (wp->w_buffer->b_ml.ml_flags & ML_EMPTY) ? 0L : (long)(wp->w_cursor.lnum); break; @@ -1602,7 +1602,7 @@ int build_stl_str_hl(win_T *wp, char *out, size_t outlen, char *fmt, char *opt_n case STL_ROFLAG: case STL_ROFLAG_ALT: // Overload %r with v:relnum for 'statuscolumn' - if (strcmp(opt_name, "statuscolumn") == 0) { + if (opt_name != NULL && strcmp(opt_name, "statuscolumn") == 0) { num = get_vim_var_nr(VV_RELNUM); } else { itemisflag = true; @@ -1628,7 +1628,7 @@ int build_stl_str_hl(win_T *wp, char *out, size_t outlen, char *fmt, char *opt_n bool fold = opt == STL_FOLDCOL; *buf_tmp = NUL; - for (int i = 0; i <= 9; i++) { + for (int i = 0; i <= SIGN_SHOW_MAX; i++) { char *p = fold ? stcp->fold_text : stcp->sign_text[i]; if ((!p || !*p) && *buf_tmp == NUL) { break; |