Patch 8.2.3930

[Bram Moolenaar]

Patch 8.2.3930
Problem: getcmdline() argument has a misleading type.
Solution: Use the correct type, even though the value is not used.
Files: src/ex_getln.c, src/proto/ex_getln.pro, src/ex_docmd.c,
src/normal.c, src/register.c, src/userfunc.c


*** ../vim-8.2.3929/src/ex_getln.c 2021-12-09 10:50:48.562865618 +0000
--- src/ex_getln.c 2021-12-28 20:57:11.052047954 +0000
***************
*** 1554,1563 ****
*/
char_u *
getcmdline(
! int firstc,
! long count, // only used for incremental search
! int indent, // indent for inside conditionals
! int do_concat UNUSED)
{
return getcmdline_int(firstc, count, indent, TRUE);
}
--- 1554,1563 ----
*/
char_u *
getcmdline(
! int firstc,
! long count, // only used for incremental search
! int indent, // indent for inside conditionals
! getline_opt_T do_concat UNUSED)
{
return getcmdline_int(firstc, count, indent, TRUE);
}
*** ../vim-8.2.3929/src/proto/ex_getln.pro 2021-11-20 19:13:35.945146370 +0000
--- src/proto/ex_getln.pro 2021-12-28 20:59:03.131973603 +0000
***************
*** 1,6 ****
/* ex_getln.c */
void cmdline_init(void);
! char_u *getcmdline(int firstc, long count, int indent, int do_concat);
char_u *getcmdline_prompt(int firstc, char_u *prompt, int attr, int xp_context, char_u *xp_arg);
int check_opt_wim(void);
int text_and_win_locked(void);
--- 1,6 ----
/* ex_getln.c */
void cmdline_init(void);
! char_u *getcmdline(int firstc, long count, int indent, getline_opt_T do_concat);
char_u *getcmdline_prompt(int firstc, char_u *prompt, int attr, int xp_context, char_u *xp_arg);
int check_opt_wim(void);
int text_and_win_locked(void);
*** ../vim-8.2.3929/src/ex_docmd.c 2021-12-27 17:21:38.004449137 +0000
--- src/ex_docmd.c 2021-12-28 20:58:11.700009482 +0000
***************
*** 1467,1473 ****

// First time inside the ":while"/":for": get line normally.
if (cp->getline == NULL)
! line = getcmdline(c, 0L, indent, options);
else
line = cp->getline(c, cp->cookie, indent, options);
if (line != NULL && store_loop_line(cp->lines_gap, line) == OK)
--- 1467,1473 ----

// First time inside the ":while"/":for": get line normally.
if (cp->getline == NULL)
! line = getcmdline(c, 0L, indent, 0);
else
line = cp->getline(c, cp->cookie, indent, options);
if (line != NULL && store_loop_line(cp->lines_gap, line) == OK)
*** ../vim-8.2.3929/src/normal.c 2021-12-26 15:00:00.499078785 +0000
--- src/normal.c 2021-12-28 20:56:06.880083593 +0000
***************
*** 4388,4394 ****

// When using 'incsearch' the cursor may be moved to set a different search
// start position.
! cap->searchbuf = getcmdline(cap->cmdchar, cap->count1, 0, TRUE);

if (cap->searchbuf == NULL)
{
--- 4388,4394 ----

// When using 'incsearch' the cursor may be moved to set a different search
// start position.
! cap->searchbuf = getcmdline(cap->cmdchar, cap->count1, 0, 0);

if (cap->searchbuf == NULL)
{
*** ../vim-8.2.3929/src/register.c 2021-12-05 22:19:22.836153466 +0000
--- src/register.c 2021-12-28 20:56:25.164074008 +0000
***************
*** 97,103 ****
{
char_u *new_line;

! new_line = getcmdline('=', 0L, 0, TRUE);
if (new_line == NULL)
return NUL;
if (*new_line == NUL) // use previous line
--- 97,103 ----
{
char_u *new_line;

! new_line = getcmdline('=', 0L, 0, 0);
if (new_line == NULL)
return NUL;
if (*new_line == NUL) // use previous line
*** ../vim-8.2.3929/src/userfunc.c 2021-12-28 20:49:52.824138911 +0000
--- src/userfunc.c 2021-12-28 20:57:45.264026765 +0000
***************
*** 180,186 ****
char_u *theline;

if (eap->getline == NULL)
! theline = getcmdline(':', 0L, indent, getline_options);
else
theline = eap->getline(':', eap->cookie, indent, getline_options);
if (theline != NULL)
--- 180,186 ----
char_u *theline;

if (eap->getline == NULL)
! theline = getcmdline(':', 0L, indent, 0);
else
theline = eap->getline(':', eap->cookie, indent, getline_options);
if (theline != NULL)
*** ../vim-8.2.3929/src/version.c 2021-12-28 20:53:27.208143390 +0000
--- src/version.c 2021-12-28 20:59:20.291961018 +0000
***************
*** 751,752 ****
--- 751,754 ----
{ /* Add new patch number below this line */
+ /**/
+ 3930,
/**/

--
Never eat yellow snow.

/// 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 ///