diff options
| -rw-r--r-- | src/screen.c | 7 | ||||
| -rw-r--r-- | src/version.c | 2 | ||||
| -rw-r--r-- | src/xdiff/xemit.c | 2 | ||||
| -rw-r--r-- | src/xdiff/xutils.c | 2 |
4 files changed, 8 insertions, 5 deletions
diff --git a/src/screen.c b/src/screen.c index 6855bba575..88775862d6 100644 --- a/src/screen.c +++ b/src/screen.c @@ -4855,7 +4855,7 @@ set_chars_option(win_T *wp, char_u **varp) { lcs_chars.tab1 = NUL; lcs_chars.tab3 = NUL; - if (multispace_len) + if (multispace_len > 0) { lcs_chars.multispace = ALLOC_MULT(int, multispace_len + 1); lcs_chars.multispace[multispace_len] = NUL; @@ -4904,7 +4904,7 @@ set_chars_option(win_T *wp, char_u **varp) if (*s == ',' || *s == NUL) { - if (round) + if (round > 0) { if (tab[i].cp == &lcs_chars.tab2) { @@ -4924,7 +4924,7 @@ set_chars_option(win_T *wp, char_u **varp) 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] == ':' @@ -4951,6 +4951,7 @@ set_chars_option(win_T *wp, char_u **varp) else { int multispace_pos = 0; + while (*s != NUL && *s != ',') { c1 = mb_ptr2char_adv(&s); diff --git a/src/version.c b/src/version.c index 6fd967c129..11a976c4bc 100644 --- a/src/version.c +++ b/src/version.c @@ -756,6 +756,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 3437, +/**/ 3436, /**/ 3435, 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) { |