diff options
| author | Jan Edmund Lazo <jan.lazo@mail.utoronto.ca> | 2021-05-31 22:01:09 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-05-31 22:01:09 -0400 |
| commit | 27c616d688c73c406726c949a3b664f52d4e4f04 (patch) | |
| tree | 9c668b6cc67d0592b6744f2a8b227c80c2b1cded /src/nvim/normal.c | |
| parent | e8f0ff1d48f5e85c0e16f0a248ff1781d4d080b3 (diff) | |
| parent | c3ac9c13dffaa79827602536519bc64d65689d05 (diff) | |
| download | rneovim-27c616d688c73c406726c949a3b664f52d4e4f04.tar.gz rneovim-27c616d688c73c406726c949a3b664f52d4e4f04.tar.bz2 rneovim-27c616d688c73c406726c949a3b664f52d4e4f04.zip | |
Merge pull request #14685 from janlazo/vim-8.2.2911
vim-patch:8.1.2400,8.2.{2911,2914.2916}
Diffstat (limited to 'src/nvim/normal.c')
| -rw-r--r-- | src/nvim/normal.c | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/src/nvim/normal.c b/src/nvim/normal.c index 13706fb14a..173d8d46d1 100644 --- a/src/nvim/normal.c +++ b/src/nvim/normal.c @@ -4384,6 +4384,12 @@ dozet: } break; + // "zp", "zP" in block mode put without addind trailing spaces + case 'P': + case 'p': + nv_put(cap); + break; + /* "zF": create fold command */ /* "zf": create fold operator */ case 'F': @@ -7913,12 +7919,14 @@ static void nv_put_opt(cmdarg_T *cap, bool fix_indent) flags |= PUT_FIXINDENT; } else { dir = (cap->cmdchar == 'P' - || (cap->cmdchar == 'g' && cap->nchar == 'P')) - ? BACKWARD : FORWARD; + || ((cap->cmdchar == 'g' || cap->cmdchar == 'z') + && cap->nchar == 'P')) ? BACKWARD : FORWARD; } prep_redo_cmd(cap); if (cap->cmdchar == 'g') { flags |= PUT_CURSEND; + } else if (cap->cmdchar == 'z') { + flags |= PUT_BLOCK_INNER; } if (VIsual_active) { |