diff options
| author | Justin M. Keyes <justinkz@gmail.com> | 2019-12-16 22:16:30 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-12-16 22:16:30 -0800 |
| commit | 1bfccf028673173dd9958930e165e595f36e4601 (patch) | |
| tree | 50109ae8d954b84f1d6f4f2bb31d376917c4a72e /src/nvim/ex_docmd.c | |
| parent | 3de1bc4bf9bd530fbeff74174d4e0ba82f92e9e4 (diff) | |
| parent | 9e6ebed6f4c695cfa00710e003d606d5d720b542 (diff) | |
| download | rneovim-1bfccf028673173dd9958930e165e595f36e4601.tar.gz rneovim-1bfccf028673173dd9958930e165e595f36e4601.tar.bz2 rneovim-1bfccf028673173dd9958930e165e595f36e4601.zip | |
Merge #11556 from janlazo/vim-8.2.0002
vim-patch:8.2.{2,8,10,12,13}
Diffstat (limited to 'src/nvim/ex_docmd.c')
| -rw-r--r-- | src/nvim/ex_docmd.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/src/nvim/ex_docmd.c b/src/nvim/ex_docmd.c index 30c1373445..d16ad9db2c 100644 --- a/src/nvim/ex_docmd.c +++ b/src/nvim/ex_docmd.c @@ -325,13 +325,13 @@ int do_cmdline(char_u *cmdline, LineGetter fgetline, int count = 0; /* line number count */ int did_inc = FALSE; /* incremented RedrawingDisabled */ int retval = OK; - struct condstack cstack; /* conditional stack */ - garray_T lines_ga; /* keep lines for ":while"/":for" */ - int current_line = 0; /* active line in lines_ga */ - char_u *fname = NULL; /* function or script name */ - linenr_T *breakpoint = NULL; /* ptr to breakpoint field in cookie */ - int *dbg_tick = NULL; /* ptr to dbg_tick field in cookie */ - struct dbg_stuff debug_saved; /* saved things for debug mode */ + cstack_T cstack; // conditional stack + garray_T lines_ga; // keep lines for ":while"/":for" + int current_line = 0; // active line in lines_ga + char_u *fname = NULL; // function or script name + linenr_T *breakpoint = NULL; // ptr to breakpoint field in cookie + int *dbg_tick = NULL; // ptr to dbg_tick field in cookie + struct dbg_stuff debug_saved; // saved things for debug mode int initial_trylevel; struct msglist **saved_msg_list = NULL; struct msglist *private_msg_list; @@ -361,7 +361,7 @@ int do_cmdline(char_u *cmdline, LineGetter fgetline, EMSG(_("E169: Command too recursive")); // When converting to an exception, we do not include the command name // since this is not an error of the specific command. - do_errthrow((struct condstack *)NULL, (char_u *)NULL); + do_errthrow((cstack_T *)NULL, (char_u *)NULL); msg_list = saved_msg_list; return FAIL; } @@ -1545,7 +1545,7 @@ static bool parse_one_cmd( */ static char_u * do_one_cmd(char_u **cmdlinep, int flags, - struct condstack *cstack, + cstack_T *cstack, LineGetter fgetline, void *cookie /* argument for fgetline() */ ) |