aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorJan Edmund Lazo <jan.lazo@mail.utoronto.ca>2019-07-01 22:54:50 -0400
committerJan Edmund Lazo <jan.lazo@mail.utoronto.ca>2019-07-05 21:26:46 -0400
commit8062e6ff88247e434890dfdfcc25ae293dafc257 (patch)
treeb9359e658157af63debd7d3d47b504d1471b6216 /src
parent3c860e25e909531954af31c832816fa22ec835e7 (diff)
downloadrneovim-8062e6ff88247e434890dfdfcc25ae293dafc257.tar.gz
rneovim-8062e6ff88247e434890dfdfcc25ae293dafc257.tar.bz2
rneovim-8062e6ff88247e434890dfdfcc25ae293dafc257.zip
vim-patch:8.1.1614: 'numberwidth' can only go up to 10
Problem: 'numberwidth' can only go up to 10. Solution: Allow up to 20. (Charlie Stanton, closes vim/vim#4584) https://github.com/vim/vim/commit/f8a071265535b8cc43e50a81f4d5049883ca50e4
Diffstat (limited to 'src')
-rw-r--r--src/nvim/option.c2
-rw-r--r--src/nvim/screen.c2
-rw-r--r--src/nvim/testdir/test_options.vim2
3 files changed, 3 insertions, 3 deletions
diff --git a/src/nvim/option.c b/src/nvim/option.c
index e8e246c277..62f736ea31 100644
--- a/src/nvim/option.c
+++ b/src/nvim/option.c
@@ -4274,7 +4274,7 @@ static char *set_num_option(int opt_idx, char_u *varp, long value,
} else if (pp == &curwin->w_p_nuw || pp == &curwin->w_allbuf_opt.wo_nuw) {
if (value < 1) {
errmsg = e_positive;
- } else if (value > 10) {
+ } else if (value > 20) {
errmsg = e_invarg;
}
} else if (pp == &curbuf->b_p_iminsert || pp == &p_iminsert) {
diff --git a/src/nvim/screen.c b/src/nvim/screen.c
index acff44164f..846ffeb442 100644
--- a/src/nvim/screen.c
+++ b/src/nvim/screen.c
@@ -2085,7 +2085,7 @@ win_line (
int lcs_eol_one = wp->w_p_lcs_chars.eol; // 'eol' until it's been used
int lcs_prec_todo = wp->w_p_lcs_chars.prec; // 'prec' until it's been used
- /* saved "extra" items for when draw_state becomes WL_LINE (again) */
+ // saved "extra" items for when draw_state becomes WL_LINE (again)
int saved_n_extra = 0;
char_u *saved_p_extra = NULL;
int saved_c_extra = 0;
diff --git a/src/nvim/testdir/test_options.vim b/src/nvim/testdir/test_options.vim
index 28576709a3..a6ebd7b023 100644
--- a/src/nvim/testdir/test_options.vim
+++ b/src/nvim/testdir/test_options.vim
@@ -231,7 +231,7 @@ func Test_set_errors()
call assert_fails('set backupcopy=', 'E474:')
call assert_fails('set regexpengine=3', 'E474:')
call assert_fails('set history=10001', 'E474:')
- call assert_fails('set numberwidth=11', 'E474:')
+ call assert_fails('set numberwidth=21', 'E474:')
call assert_fails('set colorcolumn=-a')
call assert_fails('set colorcolumn=a')
call assert_fails('set colorcolumn=1,')