Patch 8.2.4773

[Bram Moolenaar]

Patch 8.2.4773
Problem: Build failure without the +eval feature.
Solution: Use other error message. Avoid warnings.
Files: src/misc1.c, src/cindent.c, src/term.c


*** ../vim-8.2.4772/src/misc1.c 2022-04-17 14:01:46.645461121 +0100
--- src/misc1.c 2022-04-17 14:11:20.404554740 +0100
***************
*** 2343,2349 ****
|| (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);
if (fd != NULL)
fclose(fd);
goto done;
--- 2343,2349 ----
|| (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_2), tempname);
if (fd != NULL)
fclose(fd);
goto done;
*** ../vim-8.2.4772/src/cindent.c 2022-04-07 13:07:45.544309791 +0100
--- src/cindent.c 2022-04-17 14:13:05.252561427 +0100
***************
*** 420,426 ****
}

/*
! * Recognize a "public/private/protected" scope declaration label.
*/
static int
cin_isscopedecl(char_u *p)
--- 420,426 ----
}

/*
! * Recognize a scope declaration label from the 'cinscopedecls' option.
*/
static int
cin_isscopedecl(char_u *p)
***************
*** 440,446 ****

for (cinsd = curbuf->b_p_cinsd; *cinsd; )
{
! len = copy_option_part(&cinsd, cinsd_buf, cinsd_len, ",");
if (STRNCMP(s, cinsd_buf, len) == 0)
{
skip = cin_skipcomment(s + len);
--- 440,446 ----

for (cinsd = curbuf->b_p_cinsd; *cinsd; )
{
! len = copy_option_part(&cinsd, cinsd_buf, (int)cinsd_len, ",");
if (STRNCMP(s, cinsd_buf, len) == 0)
{
skip = cin_skipcomment(s + len);
*** ../vim-8.2.4772/src/term.c 2022-04-15 13:53:30.056708670 +0100
--- src/term.c 2022-04-17 14:17:26.436699498 +0100
***************
*** 5957,5963 ****
int i;
int slen;
int key;
! int dlen = 0;
char_u *src;
int do_backslash; // backslash is a special character
int do_special; // recognize <> key codes
--- 5957,5963 ----
int i;
int slen;
int key;
! size_t dlen = 0;
char_u *src;
int do_backslash; // backslash is a special character
int do_special; // recognize <> key codes
***************
*** 5977,5983 ****
* 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
{
*bufp = NULL;
return from;
--- 5977,5983 ----
* In the rare case more might be needed ga_grow() must be called again.
*/
ga_init2(&ga, 1L, 100);
! if (ga_grow(&ga, (int)(STRLEN(src) * 6 + 1)) == FAIL) // out of memory
{
*bufp = NULL;
return from;
***************
*** 6044,6051 ****
// Turn "<SID>name.Func"
// into "scriptname#Func".
len = STRLEN(si->sn_autoload_prefix);
! if (ga_grow(&ga, STRLEN(src) * 6 + len + 1)
! == FAIL)
{
ga_clear(&ga);
*bufp = NULL;
--- 6044,6051 ----
// Turn "<SID>name.Func"
// into "scriptname#Func".
len = STRLEN(si->sn_autoload_prefix);
! if (ga_grow(&ga,
! (int)(STRLEN(src) * 6 + len + 1)) == FAIL)
{
ga_clear(&ga);
*bufp = NULL;
***************
*** 6064,6070 ****
result[dlen++] = (int)KS_EXTRA;
result[dlen++] = (int)KE_SNR;
sprintf((char *)result + dlen, "%ld", sid);
! dlen += (int)STRLEN(result + dlen);
result[dlen++] = '_';
continue;
}
--- 6064,6070 ----
result[dlen++] = (int)KS_EXTRA;
result[dlen++] = (int)KE_SNR;
sprintf((char *)result + dlen, "%ld", sid);
! dlen += STRLEN(result + dlen);
result[dlen++] = '_';
continue;
}
*** ../vim-8.2.4772/src/version.c 2022-04-17 14:01:46.645461121 +0100
--- src/version.c 2022-04-17 14:17:37.292708173 +0100
***************
*** 748,749 ****
--- 748,751 ----
{ /* Add new patch number below this line */
+ /**/
+ 4773,
/**/

--
hundred-and-one symptoms of being an internet addict:
7. You finally do take that vacation, but only after buying a USB modem
and a laptop.

/// Bram Moolenaar -- Br...@Moolenaar.net -- http://www.Moolenaar.net \\\
/// \\\
\\\ sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ ///
\\\ help me help AIDS victims -- http://ICCF-Holland.org ///