Patch 8.2.0460

[Bram Moolenaar]

Patch 8.2.0460 (after 8.2.0459)
Problem: Build failure because of wrong feature name.
Solution: Correct feature name.
Files: src/evalfunc.c


*** ../vim-8.2.0459/src/evalfunc.c 2020-03-26 22:16:44.307582067 +0100
--- src/evalfunc.c 2020-03-26 23:11:49.707859653 +0100
***************
*** 915,921 ****
{"term_dumpwrite", 2, 3, FEARG_2, ret_void, TERM_FUNC(f_term_dumpwrite)},
{"term_getaltscreen", 1, 1, FEARG_1, ret_number, TERM_FUNC(f_term_getaltscreen)},
{"term_getansicolors", 1, 1, FEARG_1, ret_list_string,
! #if defined(TERMINAL) && (defined(FEAT_GUI) || defined(FEAT_TERMGUICOLORS))
f_term_getansicolors
#else
NULL
--- 915,921 ----
{"term_dumpwrite", 2, 3, FEARG_2, ret_void, TERM_FUNC(f_term_dumpwrite)},
{"term_getaltscreen", 1, 1, FEARG_1, ret_number, TERM_FUNC(f_term_getaltscreen)},
{"term_getansicolors", 1, 1, FEARG_1, ret_list_string,
! #if defined(FEAT_TERMINAL) && (defined(FEAT_GUI) || defined(FEAT_TERMGUICOLORS))
f_term_getansicolors
#else
NULL
***************
*** 934,940 ****
{"term_scrape", 2, 2, FEARG_1, ret_list_dict_any, TERM_FUNC(f_term_scrape)},
{"term_sendkeys", 2, 2, FEARG_1, ret_void, TERM_FUNC(f_term_sendkeys)},
{"term_setansicolors", 2, 2, FEARG_1, ret_void,
! #if defined(TERMINAL) && (defined(FEAT_GUI) || defined(FEAT_TERMGUICOLORS))
f_term_setansicolors
#else
NULL
--- 934,940 ----
{"term_scrape", 2, 2, FEARG_1, ret_list_dict_any, TERM_FUNC(f_term_scrape)},
{"term_sendkeys", 2, 2, FEARG_1, ret_void, TERM_FUNC(f_term_sendkeys)},
{"term_setansicolors", 2, 2, FEARG_1, ret_void,
! #if defined(FEAT_TERMINAL) && (defined(FEAT_GUI) || defined(FEAT_TERMGUICOLORS))
f_term_setansicolors
#else
NULL
*** ../vim-8.2.0459/src/version.c 2020-03-26 22:16:44.307582067 +0100
--- src/version.c 2020-03-26 23:13:18.063588215 +0100
***************
*** 740,741 ****
--- 740,743 ----
{ /* Add new patch number below this line */
+ /**/
+ 460,
/**/

--
With sufficient thrust, pigs fly just fine.
-- RFC 1925

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

[John Marriott]

On 27-Mar-2020 09:14, Bram Moolenaar wrote:
> Patch 8.2.0460 (after 8.2.0459)
> Problem: Build failure because of wrong feature name.
> Solution: Correct feature name.
> Files: src/evalfunc.c
>
>
>

After applying patches 8.2.0449 to 8.2.0460, HP-UX throws this error if
FEAT_FLOAT and FEAT_JOB_CHANNEL are not defined (I get an error to the
same effect from mingw64):
<snip>
    cc -c -I. -Iproto -DHAVE_CONFIG_H     -O2 -D_REENTRANT -o
objects/evalfunc.o evalfunc.c
cc: "evalfunc.c", line 421: error 1588: "ret_float" undefined.
cc: "evalfunc.c", line 421: error 1521: Incorrect initialization.
cc: "evalfunc.c", line 430: error 1521: Incorrect initialization.
cc: "evalfunc.c", line 443: error 1521: Incorrect initialization.
cc: "evalfunc.c", line 444: error 1521: Incorrect initialization.
cc: "evalfunc.c", line 484: error 1521: Incorrect initialization.
cc: "evalfunc.c", line 491: error 1588: "ret_job" undefined.
cc: "evalfunc.c", line 491: error 1521: Incorrect initialization.
cc: "evalfunc.c", line 495: error 1588: "ret_channel" undefined.
cc: "evalfunc.c", line 495: error 1521: Incorrect initialization.
cc: "evalfunc.c", line 515: error 1521: Incorrect initialization.
cc: "evalfunc.c", line 516: error 1521: Incorrect initialization.
cc: "evalfunc.c", line 543: error 1521: Incorrect initialization.
cc: "evalfunc.c", line 555: error 1521: Incorrect initialization.
cc: "evalfunc.c", line 556: error 1521: Incorrect initialization.
cc: "evalfunc.c", line 642: error 1521: Incorrect initialization.
cc: "evalfunc.c", line 645: error 1521: Incorrect initialization.
cc: "evalfunc.c", line 666: error 1521: Incorrect initialization.
cc: "evalfunc.c", line 667: error 1521: Incorrect initialization.
cc: "evalfunc.c", line 736: error 1521: Incorrect initialization.
cc: "evalfunc.c", line 782: error 1521: Incorrect initialization.
cc: "evalfunc.c", line 795: error 1521: Incorrect initialization.
cc: "evalfunc.c", line 852: error 1521: Incorrect initialization.
cc: "evalfunc.c", line 853: error 1521: Incorrect initialization.
cc: "evalfunc.c", line 863: error 1521: Incorrect initialization.
cc: "evalfunc.c", line 866: error 1521: Incorrect initialization.
cc: "evalfunc.c", line 910: error 1521: Incorrect initialization.
cc: "evalfunc.c", line 911: error 1521: Incorrect initialization.
cc: "evalfunc.c", line 926: error 1521: Incorrect initialization.
cc: "evalfunc.c", line 957: error 1521: Incorrect initialization.
cc: "evalfunc.c", line 959: error 1521: Incorrect initialization.
cc: "evalfunc.c", line 987: error 1521: Incorrect initialization.
*** Error exit code 1

Stop.
*** Error exit code 1

Stop.
</snip>

I'm not sure of the correct fix, so I have put together three different
possibilities, all of which appear to fix the problem both on HP-UX and
mingw64.

Regards
John

[Bram Moolenaar]

John Marriott wrote:

> On 27-Mar-2020 09:14, Bram Moolenaar wrote:
> > Patch 8.2.0460 (after 8.2.0459)
> > Problem: Build failure because of wrong feature name.
> > Solution: Correct feature name.
> > Files: src/evalfunc.c
> >
> >
> >
> After applying patches 8.2.0449 to 8.2.0460, HP-UX throws this error if
> FEAT_FLOAT and FEAT_JOB_CHANNEL are not defined (I get an error to the
> same effect from mingw64):
> <snip>
>     cc -c -I. -Iproto -DHAVE_CONFIG_H     -O2 -D_REENTRANT -o
> objects/evalfunc.o evalfunc.c
> cc: "evalfunc.c", line 421: error 1588: "ret_float" undefined.
> cc: "evalfunc.c", line 421: error 1521: Incorrect initialization.
> cc: "evalfunc.c", line 430: error 1521: Incorrect initialization.
> cc: "evalfunc.c", line 443: error 1521: Incorrect initialization.
> cc: "evalfunc.c", line 444: error 1521: Incorrect initialization.
> cc: "evalfunc.c", line 484: error 1521: Incorrect initialization.
> cc: "evalfunc.c", line 491: error 1588: "ret_job" undefined.
> cc: "evalfunc.c", line 491: error 1521: Incorrect initialization.
> cc: "evalfunc.c", line 495: error 1588: "ret_channel" undefined.
> cc: "evalfunc.c", line 495: error 1521: Incorrect initialization.

[...]

> I'm not sure of the correct fix, so I have put together three different
> possibilities, all of which appear to fix the problem both on HP-UX and
> mingw64.

I'm actually surprised it doesn't fail on more systems.

Since t_channel and t_job are always defined, might as well do the same
for t_float. Then we can remove the #ifdef's.

--
BLACK KNIGHT: Come on you pansy!
[hah] [parry thrust]
[ARTHUR chops the BLACK KNIGHT's right arm off]
ARTHUR: Victory is mine! [kneeling]
We thank thee Lord, that in thy merc-
[Black Knight kicks Arthur in the head while he is praying]
The Quest for the Holy Grail (Monty Python)

[John Marriott]

On 28-Mar-2020 06:53, Bram Moolenaar wrote:
> John Marriott wrote:
>
>> On 27-Mar-2020 09:14, Bram Moolenaar wrote:
>>> Patch 8.2.0460 (after 8.2.0459)
>>> Problem: Build failure because of wrong feature name.
>>> Solution: Correct feature name.
>>> Files: src/evalfunc.c
>>>
>>>
>>>
>

> I'm actually surprised it doesn't fail on more systems.
>
> Since t_channel and t_job are always defined, might as well do the same
> for t_float. Then we can remove the #ifdef's.
>

Hi Bram,

8.2.0463 fixed it for me.

Cheers
John