diff options
| author | Josh Rahm <rahm@google.com> | 2022-08-24 11:45:07 -0600 |
|---|---|---|
| committer | Josh Rahm <joshuarahm@gmail.com> | 2022-08-30 23:18:13 -0600 |
| commit | 9cd203045963095d16e17504aad76d3518d8d826 (patch) | |
| tree | 91a9353ad34a9a9af1d2ba72dd9bc592038c2865 | |
| parent | 9a4934da2e2c9646299286f179a7d480bfbdf7af (diff) | |
| download | rneovim-9cd203045963095d16e17504aad76d3518d8d826.tar.gz rneovim-9cd203045963095d16e17504aad76d3518d8d826.tar.bz2 rneovim-9cd203045963095d16e17504aad76d3518d8d826.zip | |
feat(colorcolchar): revert "feat: rename colorcol in fillchars to colorc"
This reverts commit 234959abbfcf075cb09304b00fc391780580056d and
renames the option 'colorc' -> 'colorcol' again.
| -rw-r--r-- | runtime/doc/options.txt | 8 | ||||
| -rw-r--r-- | src/nvim/buffer_defs.h | 2 | ||||
| -rw-r--r-- | src/nvim/drawline.c | 2 | ||||
| -rw-r--r-- | src/nvim/screen.c | 2 | ||||
| -rw-r--r-- | test/functional/ui/highlight_spec.lua | 2 |
5 files changed, 8 insertions, 8 deletions
diff --git a/runtime/doc/options.txt b/runtime/doc/options.txt index 73ab36ba0e..d41f1cf1cd 100644 --- a/runtime/doc/options.txt +++ b/runtime/doc/options.txt @@ -1351,10 +1351,10 @@ A jump table for the options with a short description can be found at |Q_op|. local to window 'colorcolumn' is a comma-separated list of screen columns that are highlighted with ColorColumn |hl-ColorColumn| and drawn using the - "colorc" option from 'fillchars'. Useful to align text. Will make - screen redrawing slower. The screen column can be an absolute number, - or a number preceded with '+' or '-', which is added to or subtracted - from 'textwidth'. > + "colorcol" option from 'fillchars'. Useful to align + text. Will make screen redrawing slower. + The screen column can be an absolute number, or a number preceded with + '+' or '-', which is added to or subtracted from 'textwidth'. > :set cc=+1 " highlight column after 'textwidth' :set cc=+1,+2,+3 " highlight three columns after 'textwidth' diff --git a/src/nvim/buffer_defs.h b/src/nvim/buffer_defs.h index 854fd79586..fbf0cb5ea9 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 3280f4be88..5862f66d72 100644 --- a/src/nvim/drawline.c +++ b/src/nvim/drawline.c @@ -2344,7 +2344,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 d0c4fd56da..88aecfad28 100644 --- a/src/nvim/screen.c +++ b/src/nvim/screen.c @@ -1328,7 +1328,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.colorc, "colorc", ' ' }, + { &wp->w_p_fcs_chars.colorcol, "colorcol", ' ' }, }; struct chars_tab lcs_tab[] = { diff --git a/test/functional/ui/highlight_spec.lua b/test/functional/ui/highlight_spec.lua index b18b7b171a..dec8e0bc80 100644 --- a/test/functional/ui/highlight_spec.lua +++ b/test/functional/ui/highlight_spec.lua @@ -856,7 +856,7 @@ describe('CursorLine and CursorLineNr highlights', function() | ]]) - command('set fillchars=colorc:.') + command('set fillchars=colorcol:.') command('set colorcolumn=3') feed('i <esc>') screen:expect([[ |