diff options
author | Josh Rahm <rahm@google.com> | 2022-08-22 15:52:40 -0600 |
---|---|---|
committer | Josh Rahm <rahm@google.com> | 2022-08-22 15:52:40 -0600 |
commit | 8fc6e69877f6c15942b4e8fc6ca471e4221d9bae (patch) | |
tree | 46111208bfc5e17b35a54e64906887ce40fa8774 /src/nvim/ex_cmds2.c | |
parent | e083d3adf49ef827bd28693a29ff25b4bd2588ad (diff) | |
parent | baaaa1f2b3b6ae3a989d1362a27e55dc7b0b148a (diff) | |
download | rneovim-8fc6e69877f6c15942b4e8fc6ca471e4221d9bae.tar.gz rneovim-8fc6e69877f6c15942b4e8fc6ca471e4221d9bae.tar.bz2 rneovim-8fc6e69877f6c15942b4e8fc6ca471e4221d9bae.zip |
Merge remote-tracking branch 'upstream/master' into usermarks
Diffstat (limited to 'src/nvim/ex_cmds2.c')
-rw-r--r-- | src/nvim/ex_cmds2.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/nvim/ex_cmds2.c b/src/nvim/ex_cmds2.c index 54315a6417..2ed45f7ab8 100644 --- a/src/nvim/ex_cmds2.c +++ b/src/nvim/ex_cmds2.c @@ -544,9 +544,9 @@ void ex_listdo(exarg_T *eap) // Clear 'shm' to avoid that the file message overwrites // any output from the command. p_shm_save = (char *)vim_strsave(p_shm); - set_option_value("shm", 0L, "", 0); + set_option_value_give_err("shm", 0L, "", 0); do_argfile(eap, i); - set_option_value("shm", 0L, p_shm_save, 0); + set_option_value_give_err("shm", 0L, p_shm_save, 0); xfree(p_shm_save); } if (curwin->w_arg_idx != i) { @@ -613,9 +613,9 @@ void ex_listdo(exarg_T *eap) // Go to the next buffer. Clear 'shm' to avoid that the file // message overwrites any output from the command. p_shm_save = (char *)vim_strsave(p_shm); - set_option_value("shm", 0L, "", 0); + set_option_value_give_err("shm", 0L, "", 0); goto_buffer(eap, DOBUF_FIRST, FORWARD, next_fnum); - set_option_value("shm", 0L, p_shm_save, 0); + set_option_value_give_err("shm", 0L, p_shm_save, 0); xfree(p_shm_save); // If autocommands took us elsewhere, quit here. @@ -636,9 +636,9 @@ void ex_listdo(exarg_T *eap) // Clear 'shm' to avoid that the file message overwrites // any output from the command. p_shm_save = (char *)vim_strsave(p_shm); - set_option_value("shm", 0L, "", 0); + set_option_value_give_err("shm", 0L, "", 0); ex_cnext(eap); - set_option_value("shm", 0L, p_shm_save, 0); + set_option_value_give_err("shm", 0L, p_shm_save, 0); xfree(p_shm_save); // If jumping to the next quickfix entry fails, quit here. |