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/proto/diff.pro | |
| 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/proto/diff.pro')
| -rw-r--r-- | src/proto/diff.pro | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/proto/diff.pro b/src/proto/diff.pro index 18c42651f..3234fde1a 100644 --- a/src/proto/diff.pro +++ b/src/proto/diff.pro @@ -18,7 +18,7 @@ int diffopt_changed __ARGS((void)); int diffopt_horizontal __ARGS((void)); int diff_find_change __ARGS((win_T *wp, linenr_T lnum, int *startp, int *endp)); int diff_infold __ARGS((win_T *wp, linenr_T lnum)); -void nv_diffgetput __ARGS((int put)); +void nv_diffgetput __ARGS((int put, long count)); void ex_diffgetput __ARGS((exarg_T *eap)); int diff_mode_buf __ARGS((buf_T *buf)); int diff_move_to __ARGS((int dir, long count)); |