Merge branch 'colorcolchar' into 20230125_mix

3 files changed, 4 insertions, 0 deletions

diff --git a/src/nvim/buffer_defs.h b/src/nvim/buffer_defs.h
index 081c598966..e57e08ace2 100644
--- a/src/nvim/buffer_defs.h
+++ b/src/nvim/buffer_defs.h
@@ -1177,6 +1177,7 @@ struct window_S {
     int diff;
     int msgsep;
     int eob;
+    int colorcol;
     int lastline;
   } w_p_fcs_chars;
 
diff --git a/src/nvim/drawline.c b/src/nvim/drawline.c
index e24d86b353..28f19a95e0 100644
--- a/src/nvim/drawline.c
+++ b/src/nvim/drawline.c
@@ -2521,6 +2521,8 @@ int win_line(win_T *wp, linenr_T lnum, int startrow, int endrow, bool nochange,
             col_attr = cuc_attr;
           } else if (draw_color_col && VCOL_HLC == *color_cols) {
             col_attr = mc_attr;
+            c = wp->w_p_fcs_chars.colorcol;
+            schar_from_char(linebuf_char[off], c);
           }
 
           col_attr = hl_combine_attr(col_attr, line_attr);
diff --git a/src/nvim/screen.c b/src/nvim/screen.c
index 2002f554d4..83ca32e0e9 100644
--- a/src/nvim/screen.c
+++ b/src/nvim/screen.c
@@ -885,6 +885,7 @@ char *set_chars_option(win_T *wp, char **varp, bool apply)
     { &wp->w_p_fcs_chars.diff,       "diff",      '-' },
     { &wp->w_p_fcs_chars.msgsep,     "msgsep",    ' ' },
     { &wp->w_p_fcs_chars.eob,        "eob",       '~' },
+    { &wp->w_p_fcs_chars.colorcol,   "colorcol",  ' ' },
     { &wp->w_p_fcs_chars.lastline,   "lastline",  '@' },
   };