mirrors/neovim
1
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2025-09-16 00:08:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

options: move more validation together

Browse Source
This commit is contained in:
Jakob Schnitzer
2017-03-27 19:26:41 +02:00
parent 1a56a032fe
commit 0273f96ef6
1 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/nvim/option.c
View File

@@ -4095,6 +4095,14 @@ static char *set_num_option(int opt_idx, char_u *varp, long value,
if (p_ch < 1) { if (p_ch < 1) {
errmsg = e_positive; errmsg = e_positive;
} }
} else if (pp == &curbuf->b_p_ts) {
if (curbuf->b_p_ts <= 0) {
errmsg = e_positive;
}
} else if (pp == &p_tm) {
if (p_tm < 0) {
errmsg = e_positive;
}
} }
// If validation failed, reset to old value and return. // If validation failed, reset to old value and return.
@@ -4246,14 +4254,6 @@ static char *set_num_option(int opt_idx, char_u *varp, long value,
} }
} }
if (curbuf->b_p_ts <= 0) {
errmsg = e_positive;
curbuf->b_p_ts = 8;
}
if (p_tm < 0) {
errmsg = e_positive;
p_tm = 0;
}
if ((curwin->w_p_scr <= 0 if ((curwin->w_p_scr <= 0
|| (curwin->w_p_scr > curwin->w_height || (curwin->w_p_scr > curwin->w_height
&& curwin->w_height > 0)) && curwin->w_height > 0))