diff options
| author | Bram Moolenaar <Bram@vim.org> | 2014-10-31 13:54:25 +0100 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2014-10-31 13:54:25 +0100 |
| commit | 6a64365c952895ecc2219b303d9bf64dabf8f2e7 (patch) | |
| tree | 24cdbbf8fd4c44e442c18f519ecb488dfee4f97e /src/normal.c | |
| parent | fe3c41009887331dc9fee2bedf457728117be544 (diff) | |
| download | vim-git-6a64365c952895ecc2219b303d9bf64dabf8f2e7.tar.gz | |
updated for version 7.4.490v7.4.490
Problem: Cannot specify the buffer to use for "do" and "dp", making them
useless for three-way diff.
Solution: Use the count as the buffer number. (James McCoy)
Diffstat (limited to 'src/normal.c')
| -rw-r--r-- | src/normal.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/normal.c b/src/normal.c index 0116d058b..bd5bacd59 100644 --- a/src/normal.c +++ b/src/normal.c @@ -9284,7 +9284,7 @@ nv_put(cap) if (cap->oap->op_type == OP_DELETE && cap->cmdchar == 'p') { clearop(cap->oap); - nv_diffgetput(TRUE); + nv_diffgetput(TRUE, cap->opcount); } else #endif @@ -9407,7 +9407,7 @@ nv_open(cap) if (cap->oap->op_type == OP_DELETE && cap->cmdchar == 'o') { clearop(cap->oap); - nv_diffgetput(FALSE); + nv_diffgetput(FALSE, cap->opcount); } else #endif |