diff options
author | Jan Edmund Lazo <jan.lazo@mail.utoronto.ca> | 2021-01-29 18:02:43 -0500 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-01-29 18:02:43 -0500 |
commit | ad98b84008586a1863e8b05b3db6d2c6c7ad4db8 (patch) | |
tree | 836ddf9beab731ee4bf72cb914f115ebbe5ef139 /src/nvim/ex_cmds.c | |
parent | 8950f4e94af1534852cab5f41066d7c21330bd64 (diff) | |
parent | 1376994f1556b51d6a4feaedc094ee2456db5d06 (diff) | |
download | rneovim-ad98b84008586a1863e8b05b3db6d2c6c7ad4db8.tar.gz rneovim-ad98b84008586a1863e8b05b3db6d2c6c7ad4db8.tar.bz2 rneovim-ad98b84008586a1863e8b05b3db6d2c6c7ad4db8.zip |
Merge pull request #13833 from janlazo/vim-8.2.2412
vim-patch:8.2.{2412,2418,2420,2425}
Diffstat (limited to 'src/nvim/ex_cmds.c')
-rw-r--r-- | src/nvim/ex_cmds.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/nvim/ex_cmds.c b/src/nvim/ex_cmds.c index a2487336f1..2da8c205c1 100644 --- a/src/nvim/ex_cmds.c +++ b/src/nvim/ex_cmds.c @@ -3126,6 +3126,9 @@ static bool sub_joining_lines(exarg_T *eap, char_u *pat, char_u *sub, || *cmd == 'l' || *cmd == 'p' || *cmd == '#')))) { + if (eap->skip) { + return true; + } curwin->w_cursor.lnum = eap->line1; if (*cmd == 'l') { eap->flags = EXFLAG_LIST; |