mirrors/neovim
1
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2025-09-11 05:48:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

vim-patch:7.4.490

Browse Source 
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)

https://code.google.com/p/vim/source/detail?r=v7-4-490
This commit is contained in:
Florian Walch
2014-12-23 13:06:39 +01:00
parent 10ff6ee0d7
commit 1cf933e7be
3 changed files with 17 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/nvim/diff.c
View File

@@ -2017,17 +2017,24 @@ int diff_infold(win_T *wp, linenr_T lnum)
}
/// "dp" and "do" commands.
///
/// @param put
void nv_diffgetput(int put)
void nv_diffgetput(bool put, size_t count)
{
exarg_T ea;
ea.arg = (char_u *)"";
char buf[30];
if (count == 0) {
ea.arg = (char_u *)"";
} else {
vim_snprintf(buf, 30, "%zu", count);
ea.arg = (char_u *)buf;
}
if (put) {
ea.cmdidx = CMD_diffput;
} else {
ea.cmdidx = CMD_diffget;
}
ea.addr_count = 0;
ea.line1 = curwin->w_cursor.lnum;
ea.line2 = curwin->w_cursor.lnum;