diff options
| author | Josh Rahm <joshuarahm@gmail.com> | 2022-08-21 12:32:25 -0600 |
|---|---|---|
| committer | Josh Rahm <joshuarahm@gmail.com> | 2022-08-27 20:53:30 -0600 |
| commit | 2a1e15d2a76d1e0a0a177d87f233e7ceecb25ade (patch) | |
| tree | 8037d1adef037be7e14577bb807af2b4e7971041 | |
| parent | 33c115d92a47fb62b06d27074bd7270d30c1e637 (diff) | |
| download | rneovim-2a1e15d2a76d1e0a0a177d87f233e7ceecb25ade.tar.gz rneovim-2a1e15d2a76d1e0a0a177d87f233e7ceecb25ade.tar.bz2 rneovim-2a1e15d2a76d1e0a0a177d87f233e7ceecb25ade.zip | |
feat(colorcolchar): rename colorcol in fillchars to colorc
Rename the colorcol option in fillchars to the more terse colorc.
| -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 d41f1cf1cd..73ab36ba0e 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 - "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'. > + "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'. > :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 f276ac771d..7e47496291 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 colorcol; + int colorc; } w_p_fcs_chars; /* diff --git a/src/nvim/drawline.c b/src/nvim/drawline.c index b97d323ef2..85ea033eb0 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.colorcol; + c = wp->w_p_fcs_chars.colorc; schar_from_char(linebuf_char[off], c); } diff --git a/src/nvim/screen.c b/src/nvim/screen.c index eb4eef6e31..954068a388 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.colorcol, "colorcol", ' ' }, + { &wp->w_p_fcs_chars.colorc, "colorc", ' ' }, }; struct chars_tab lcs_tab[] = { diff --git a/test/functional/ui/highlight_spec.lua b/test/functional/ui/highlight_spec.lua index b0b2920ae9..87c632c6e0 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=colorcol:|') + command('set fillchars=colorc:|') command('set colorcolumn=3') feed('i <esc>') screen:expect([[ |