forked from aniani/vim
patch 8.2.4773: build failure without the +eval feature
Problem: Build failure without the +eval feature. Solution: Use other error message. Avoid warnings.
This commit is contained in:
@@ -420,7 +420,7 @@ cin_islabel_skip(char_u **s)
|
||||
}
|
||||
|
||||
/*
|
||||
* Recognize a "public/private/protected" scope declaration label.
|
||||
* Recognize a scope declaration label from the 'cinscopedecls' option.
|
||||
*/
|
||||
static int
|
||||
cin_isscopedecl(char_u *p)
|
||||
@@ -440,7 +440,7 @@ cin_isscopedecl(char_u *p)
|
||||
|
||||
for (cinsd = curbuf->b_p_cinsd; *cinsd; )
|
||||
{
|
||||
len = copy_option_part(&cinsd, cinsd_buf, cinsd_len, ",");
|
||||
len = copy_option_part(&cinsd, cinsd_buf, (int)cinsd_len, ",");
|
||||
if (STRNCMP(s, cinsd_buf, len) == 0)
|
||||
{
|
||||
skip = cin_skipcomment(s + len);
|
||||
|
@@ -2343,7 +2343,7 @@ get_cmd_output(
|
||||
|| (len = ftell(fd)) == -1 // get size of temp file
|
||||
|| fseek(fd, 0L, SEEK_SET) == -1) // back to the start
|
||||
{
|
||||
semsg(_(e_cannot_read_from_str), tempname);
|
||||
semsg(_(e_cannot_read_from_str_2), tempname);
|
||||
if (fd != NULL)
|
||||
fclose(fd);
|
||||
goto done;
|
||||
|
10
src/term.c
10
src/term.c
@@ -5957,7 +5957,7 @@ replace_termcodes(
|
||||
int i;
|
||||
int slen;
|
||||
int key;
|
||||
int dlen = 0;
|
||||
size_t dlen = 0;
|
||||
char_u *src;
|
||||
int do_backslash; // backslash is a special character
|
||||
int do_special; // recognize <> key codes
|
||||
@@ -5977,7 +5977,7 @@ replace_termcodes(
|
||||
* In the rare case more might be needed ga_grow() must be called again.
|
||||
*/
|
||||
ga_init2(&ga, 1L, 100);
|
||||
if (ga_grow(&ga, STRLEN(src) * 6 + 1) == FAIL) // out of memory
|
||||
if (ga_grow(&ga, (int)(STRLEN(src) * 6 + 1)) == FAIL) // out of memory
|
||||
{
|
||||
*bufp = NULL;
|
||||
return from;
|
||||
@@ -6044,8 +6044,8 @@ replace_termcodes(
|
||||
// Turn "<SID>name.Func"
|
||||
// into "scriptname#Func".
|
||||
len = STRLEN(si->sn_autoload_prefix);
|
||||
if (ga_grow(&ga, STRLEN(src) * 6 + len + 1)
|
||||
== FAIL)
|
||||
if (ga_grow(&ga,
|
||||
(int)(STRLEN(src) * 6 + len + 1)) == FAIL)
|
||||
{
|
||||
ga_clear(&ga);
|
||||
*bufp = NULL;
|
||||
@@ -6064,7 +6064,7 @@ replace_termcodes(
|
||||
result[dlen++] = (int)KS_EXTRA;
|
||||
result[dlen++] = (int)KE_SNR;
|
||||
sprintf((char *)result + dlen, "%ld", sid);
|
||||
dlen += (int)STRLEN(result + dlen);
|
||||
dlen += STRLEN(result + dlen);
|
||||
result[dlen++] = '_';
|
||||
continue;
|
||||
}
|
||||
|
@@ -746,6 +746,8 @@ static char *(features[]) =
|
||||
|
||||
static int included_patches[] =
|
||||
{ /* Add new patch number below this line */
|
||||
/**/
|
||||
4773,
|
||||
/**/
|
||||
4772,
|
||||
/**/
|
||||
|
Reference in New Issue
Block a user