Mercurial > vim
changeset 26804:34f1b7d6974a
patch 8.2.3930: getcmdline() argument has a misleading type
Commit: https://github.com/vim/vim/commit/c97f9a55bd020b94d92c392516d763ed5e43d872
Author: Bram Moolenaar <Bram@vim.org>
Date: Tue Dec 28 20:59:56 2021 +0000
patch 8.2.3930: getcmdline() argument has a misleading type
Problem: getcmdline() argument has a misleading type.
Solution: Use the correct type, even though the value is not used.
| author | Bram Moolenaar <Bram@vim.org> |
|---|---|
| date | Tue, 28 Dec 2021 22:00:07 +0100 |
| parents | 90fea59d6307 |
| children | 77ff030699d2 |
| files | src/ex_docmd.c src/ex_getln.c src/normal.c src/proto/ex_getln.pro src/register.c src/userfunc.c src/version.c |
| diffstat | 7 files changed, 11 insertions(+), 9 deletions(-) [+] |
line wrap: on
line diff
--- a/src/ex_docmd.c +++ b/src/ex_docmd.c @@ -1467,7 +1467,7 @@ get_loop_line(int c, void *cookie, int i // First time inside the ":while"/":for": get line normally. if (cp->getline == NULL) - line = getcmdline(c, 0L, indent, options); + 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)
--- a/src/ex_getln.c +++ b/src/ex_getln.c @@ -1554,10 +1554,10 @@ init_ccline(int firstc, int indent) */ char_u * getcmdline( - int firstc, - long count, // only used for incremental search - int indent, // indent for inside conditionals - int do_concat UNUSED) + 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); }
--- a/src/normal.c +++ b/src/normal.c @@ -4388,7 +4388,7 @@ nv_search(cmdarg_T *cap) // When using 'incsearch' the cursor may be moved to set a different search // start position. - cap->searchbuf = getcmdline(cap->cmdchar, cap->count1, 0, TRUE); + cap->searchbuf = getcmdline(cap->cmdchar, cap->count1, 0, 0); if (cap->searchbuf == NULL) {
--- a/src/proto/ex_getln.pro +++ b/src/proto/ex_getln.pro @@ -1,6 +1,6 @@ /* ex_getln.c */ void cmdline_init(void); -char_u *getcmdline(int firstc, long count, int indent, int do_concat); +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);
--- a/src/register.c +++ b/src/register.c @@ -97,7 +97,7 @@ get_expr_register(void) { char_u *new_line; - new_line = getcmdline('=', 0L, 0, TRUE); + new_line = getcmdline('=', 0L, 0, 0); if (new_line == NULL) return NUL; if (*new_line == NUL) // use previous line
--- a/src/userfunc.c +++ b/src/userfunc.c @@ -180,7 +180,7 @@ get_function_line( char_u *theline; if (eap->getline == NULL) - theline = getcmdline(':', 0L, indent, getline_options); + theline = getcmdline(':', 0L, indent, 0); else theline = eap->getline(':', eap->cookie, indent, getline_options); if (theline != NULL)