diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/nvim/option.c | 4 | ||||
| -rw-r--r-- | src/xdiff/xemit.c | 2 | ||||
| -rw-r--r-- | src/xdiff/xutils.c | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/src/nvim/option.c b/src/nvim/option.c index 5d5d803646..d3056aaa83 100644 --- a/src/nvim/option.c +++ b/src/nvim/option.c @@ -3558,7 +3558,7 @@ static char_u *set_chars_option(win_T *wp, char_u **varp, bool set) } } if (*s == ',' || *s == NUL) { - if (round) { + if (round > 0) { if (tab[i].cp == &wp->w_p_lcs_chars.tab2) { wp->w_p_lcs_chars.tab1 = c1; wp->w_p_lcs_chars.tab2 = c2; @@ -3574,7 +3574,7 @@ static char_u *set_chars_option(win_T *wp, char_u **varp, bool set) } if (i == entries) { - len = STRLEN("multispace"); + len = (int)STRLEN("multispace"); if ((varp == &p_lcs || varp == &wp->w_p_lcs) && STRNCMP(p, "multispace", len) == 0 && p[len] == ':' diff --git a/src/xdiff/xemit.c b/src/xdiff/xemit.c index a0078f928c..b578e7a9d5 100644 --- a/src/xdiff/xemit.c +++ b/src/xdiff/xemit.c @@ -31,7 +31,7 @@ static long xdl_get_rec(xdfile_t *xdf, long ri, char const **rec) { static int xdl_emit_record(xdfile_t *xdf, long ri, char const *pre, xdemitcb_t *ecb) { - long size, psize = strlen(pre); + long size, psize = (long)strlen(pre); char const *rec; size = xdl_get_rec(xdf, ri, &rec); diff --git a/src/xdiff/xutils.c b/src/xdiff/xutils.c index 5ef519155d..f13a854536 100644 --- a/src/xdiff/xutils.c +++ b/src/xdiff/xutils.c @@ -47,7 +47,7 @@ int xdl_emit_diffrec(char const *rec, long size, char const *pre, long psize, mb[1].size = size; if (size > 0 && rec[size - 1] != '\n') { mb[2].ptr = (char *) "\n\\ No newline at end of file\n"; - mb[2].size = strlen(mb[2].ptr); + mb[2].size = (long)strlen(mb[2].ptr); i++; } if (ecb->out_line(ecb->priv, mb, i) < 0) { |