diff options
| author | Justin M. Keyes <justinkz@gmail.com> | 2019-05-27 12:01:35 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-05-27 12:01:35 +0200 |
| commit | 69b3d5acd375e36a06474c6ebd2622cb0c2fcca5 (patch) | |
| tree | f34ba1b9e0e138f86666e77280da66f6ca0687e3 /src/nvim/ex_docmd.c | |
| parent | fb4d5a184678ab231da20ef559c8e423dfa54d6e (diff) | |
| parent | 3c3b7844b95879bcfd86677df4cfac3edb0fb132 (diff) | |
| download | rneovim-69b3d5acd375e36a06474c6ebd2622cb0c2fcca5.tar.gz rneovim-69b3d5acd375e36a06474c6ebd2622cb0c2fcca5.tar.bz2 rneovim-69b3d5acd375e36a06474c6ebd2622cb0c2fcca5.zip | |
Merge #10068 from janlazo/vim-8.1.0020
vim-patch:8.1.{20,995,1077}
Diffstat (limited to 'src/nvim/ex_docmd.c')
| -rw-r--r-- | src/nvim/ex_docmd.c | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/src/nvim/ex_docmd.c b/src/nvim/ex_docmd.c index 527120ae9f..9e056d449b 100644 --- a/src/nvim/ex_docmd.c +++ b/src/nvim/ex_docmd.c @@ -1233,7 +1233,7 @@ static char_u * do_one_cmd(char_u **cmdlinep, int did_esilent = 0; int did_sandbox = FALSE; cmdmod_T save_cmdmod; - int ni; /* set when Not Implemented */ + const int save_reg_executing = reg_executing; char_u *cmd; int address_count = 1; @@ -1762,10 +1762,10 @@ static char_u * do_one_cmd(char_u **cmdlinep, goto doend; } - ni = (!IS_USER_CMDIDX(ea.cmdidx) - && (cmdnames[ea.cmdidx].cmd_func == ex_ni - || cmdnames[ea.cmdidx].cmd_func == ex_script_ni - )); + // set when Not Implemented + const int ni = !IS_USER_CMDIDX(ea.cmdidx) + && (cmdnames[ea.cmdidx].cmd_func == ex_ni + || cmdnames[ea.cmdidx].cmd_func == ex_script_ni); // Forced commands. @@ -2298,6 +2298,7 @@ doend: } cmdmod = save_cmdmod; + reg_executing = save_reg_executing; if (save_msg_silent != -1) { /* messages could be enabled for a serious error, need to check if the |