aboutsummaryrefslogtreecommitdiff
path: root/src/nvim/main.c
diff options
context:
space:
mode:
authorerw7 <erw7.github@gmail.com>2019-08-29 13:07:03 +0900
committererw7 <erw7.github@gmail.com>2019-09-04 13:40:05 +0900
commit9db60b06a1d9b50b3ba6beb858eb0fd2c58571c4 (patch)
treebd7d55a5af91afae726345b7fc40324625241879 /src/nvim/main.c
parente4a47862415ee6e0c4904f9c5cc8c3453be6bf17 (diff)
downloadrneovim-9db60b06a1d9b50b3ba6beb858eb0fd2c58571c4.tar.gz
rneovim-9db60b06a1d9b50b3ba6beb858eb0fd2c58571c4.tar.bz2
rneovim-9db60b06a1d9b50b3ba6beb858eb0fd2c58571c4.zip
vim-patch:8.1.0515: reloading a script gives errors for existing functions
Problem: Reloading a script gives errors for existing functions. Solution: Allow redefining a function once when reloading a script. https://github.com/vim/vim/commit/ded5f1bed7ff2d138b3ee0f9610d17290b62692d
Diffstat (limited to 'src/nvim/main.c')
-rw-r--r--src/nvim/main.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/src/nvim/main.c b/src/nvim/main.c
index 9ea856a0c4..50e495c1e6 100644
--- a/src/nvim/main.c
+++ b/src/nvim/main.c
@@ -1665,6 +1665,7 @@ static void exe_commands(mparm_T *parmp)
curwin->w_cursor.lnum = 0;
sourcing_name = (char_u *)"command line";
current_sctx.sc_sid = SID_CARG;
+ current_sctx.sc_seq = 0;
for (i = 0; i < parmp->n_commands; i++) {
do_cmdline_cmd(parmp->commands[i]);
if (parmp->cmds_tofree[i])
@@ -1862,6 +1863,7 @@ static int execute_env(char *env)
sourcing_lnum = 0;
const sctx_T save_current_sctx = current_sctx;
current_sctx.sc_sid = SID_ENV;
+ current_sctx.sc_seq = 0;
current_sctx.sc_lnum = 0;
do_cmdline_cmd((char *)initstr);
sourcing_name = save_sourcing_name;