diff options
| author | Matthieu Coudron <mattator@gmail.com> | 2020-05-25 14:01:36 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-05-25 14:01:36 +0200 |
| commit | 8c588246a505e4fcd3d28e6d1f670e834c918529 (patch) | |
| tree | b1ffbf9bc47870e4b86b37b14e9d638158e0014e /src/nvim/ex_cmds2.c | |
| parent | b996205969d5c56e9110158e48cef559e9de0969 (diff) | |
| parent | a532fb2cf425ef15dbbbee6dd00d1401c90aebae (diff) | |
| download | rneovim-8c588246a505e4fcd3d28e6d1f670e834c918529.tar.gz rneovim-8c588246a505e4fcd3d28e6d1f670e834c918529.tar.bz2 rneovim-8c588246a505e4fcd3d28e6d1f670e834c918529.zip | |
Merge pull request #10905 from erw7/vim-8.1.0475
vim-patch:8.1.{475,800,868,1007,1027,1031,1033,1037,1058,1435,1484,1485}
Diffstat (limited to 'src/nvim/ex_cmds2.c')
| -rw-r--r-- | src/nvim/ex_cmds2.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/nvim/ex_cmds2.c b/src/nvim/ex_cmds2.c index 9f4055af8d..7f4b01e306 100644 --- a/src/nvim/ex_cmds2.c +++ b/src/nvim/ex_cmds2.c @@ -3107,7 +3107,6 @@ int do_source(char_u *fname, int check_other, int is_vimrc) int retval = FAIL; static scid_T last_current_SID = 0; static int last_current_SID_seq = 0; - void *save_funccalp; int save_debug_break_level = debug_break_level; scriptitem_T *si = NULL; proftime_T wait_start; @@ -3228,7 +3227,8 @@ int do_source(char_u *fname, int check_other, int is_vimrc) // Don't use local function variables, if called from a function. // Also starts profiling timer for nested script. - save_funccalp = save_funccal(); + funccal_entry_T funccalp_entry; + save_funccal(&funccalp_entry); // Check if this script was sourced before to finds its SID. // If it's new, generate a new SID. @@ -3353,7 +3353,7 @@ int do_source(char_u *fname, int check_other, int is_vimrc) } current_sctx = save_current_sctx; - restore_funccal(save_funccalp); + restore_funccal(); if (l_do_profiling == PROF_YES) { prof_child_exit(&wait_start); // leaving a child now } |