Mercurial > vim

diff src/normal.c @ 6314:df92c2b2a179 v7.4.490

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
updated for version 7.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)
author Bram Moolenaar <bram@vim.org>
date Fri, 31 Oct 2014 13:54:25 +0100
parents a6f5a4ac4d46
children 749fc929da45
line wrap: on
line diff
--- 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