Mercurial > vim

comparison 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
comparison
equal deleted inserted replaced
6313:8b928b7530d4 6314:df92c2b2a179
9282 #ifdef FEAT_DIFF 9282 #ifdef FEAT_DIFF
9283 /* "dp" is ":diffput" */ 9283 /* "dp" is ":diffput" */
9284 if (cap->oap->op_type == OP_DELETE && cap->cmdchar == 'p') 9284 if (cap->oap->op_type == OP_DELETE && cap->cmdchar == 'p')
9285 { 9285 {
9286 clearop(cap->oap); 9286 clearop(cap->oap);
9287 nv_diffgetput(TRUE); 9287 nv_diffgetput(TRUE, cap->opcount);
9288 } 9288 }
9289 else 9289 else
9290 #endif 9290 #endif
9291 clearopbeep(cap->oap); 9291 clearopbeep(cap->oap);
9292 } 9292 }
9405 #ifdef FEAT_DIFF 9405 #ifdef FEAT_DIFF
9406 /* "do" is ":diffget" */ 9406 /* "do" is ":diffget" */
9407 if (cap->oap->op_type == OP_DELETE && cap->cmdchar == 'o') 9407 if (cap->oap->op_type == OP_DELETE && cap->cmdchar == 'o')
9408 { 9408 {
9409 clearop(cap->oap); 9409 clearop(cap->oap);
9410 nv_diffgetput(FALSE); 9410 nv_diffgetput(FALSE, cap->opcount);
9411 } 9411 }
9412 else 9412 else
9413 #endif 9413 #endif
9414 if (VIsual_active) /* switch start and end of visual */ 9414 if (VIsual_active) /* switch start and end of visual */
9415 v_swap_corners(cap->cmdchar); 9415 v_swap_corners(cap->cmdchar);