aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorJosh Rahm <rahm@google.com>2022-08-24 11:45:07 -0600
committerJosh Rahm <joshuarahm@gmail.com>2022-08-27 20:53:30 -0600
commitde6bcd7e7b3290b6d164293f414dcc13461abdd6 (patch)
tree6a3eec05d58f313321e68559b8168c717cd0c83d /src
parentf8bddb98545c09a5b861e9d4e0f4edd1e920a4b3 (diff)
downloadrneovim-de6bcd7e7b3290b6d164293f414dcc13461abdd6.tar.gz
rneovim-de6bcd7e7b3290b6d164293f414dcc13461abdd6.tar.bz2
rneovim-de6bcd7e7b3290b6d164293f414dcc13461abdd6.zip
feat(colorcolchar): revert "feat: rename colorcol in fillchars to colorc"
This reverts commit 234959abbfcf075cb09304b00fc391780580056d and renames the option 'colorc' -> 'colorcol' again.
Diffstat (limited to 'src')
-rw-r--r--src/nvim/buffer_defs.h2
-rw-r--r--src/nvim/drawline.c2
-rw-r--r--src/nvim/screen.c2
3 files changed, 3 insertions, 3 deletions
diff --git a/src/nvim/buffer_defs.h b/src/nvim/buffer_defs.h
index 7e47496291..f276ac771d 100644
--- a/src/nvim/buffer_defs.h
+++ b/src/nvim/buffer_defs.h
@@ -1219,7 +1219,7 @@ struct window_S {
int diff;
int msgsep;
int eob;
- int colorc;
+ int colorcol;
} w_p_fcs_chars;
/*
diff --git a/src/nvim/drawline.c b/src/nvim/drawline.c
index 85ea033eb0..b97d323ef2 100644
--- a/src/nvim/drawline.c
+++ b/src/nvim/drawline.c
@@ -2334,7 +2334,7 @@ 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.colorc;
+ c = wp->w_p_fcs_chars.colorcol;
schar_from_char(linebuf_char[off], c);
}
diff --git a/src/nvim/screen.c b/src/nvim/screen.c
index 954068a388..eb4eef6e31 100644
--- a/src/nvim/screen.c
+++ b/src/nvim/screen.c
@@ -1328,7 +1328,7 @@ char *set_chars_option(win_T *wp, char_u **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.colorc, "colorc", ' ' },
+ { &wp->w_p_fcs_chars.colorcol, "colorcol", ' ' },
};
struct chars_tab lcs_tab[] = {