Skip to content

Commit

Permalink
updated for version 7.3.649
Browse files Browse the repository at this point in the history
Problem:    When 'clipboard' is set to "unnamed" small deletes end up in the
	    numbered registers. (Ingo Karkat)
Solution:   Use the original register name to decide whether to put a delete
	    in a numbered register. (Christian Brabandt)
  • Loading branch information
brammool committed Sep 5, 2012
1 parent 395c4a7 commit e7de33a
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 1 deletion.
5 changes: 4 additions & 1 deletion src/ops.c
Original file line number Diff line number Diff line change
Expand Up @@ -1623,6 +1623,7 @@ op_delete(oap)
#endif
linenr_T old_lcount = curbuf->b_ml.ml_line_count;
int did_yank = FALSE;
int orig_regname = oap->regname;

if (curbuf->b_ml.ml_flags & ML_EMPTY) /* nothing to do */
return OK;
Expand Down Expand Up @@ -1715,8 +1716,10 @@ op_delete(oap)
/*
* Put deleted text into register 1 and shift number registers if the
* delete contains a line break, or when a regname has been specified.
* Use the register name from before adjust_clip_reg() may have
* changed it.
*/
if (oap->regname != 0 || oap->motion_type == MLINE
if (orig_regname != 0 || oap->motion_type == MLINE
|| oap->line_count > 1 || oap->use_reg_one)
{
y_current = &y_regs[9];
Expand Down
2 changes: 2 additions & 0 deletions src/version.c
Original file line number Diff line number Diff line change
Expand Up @@ -719,6 +719,8 @@ static char *(features[]) =

static int included_patches[] =
{ /* Add new patch number below this line */
/**/
649,
/**/
648,
/**/
Expand Down

0 comments on commit e7de33a

Please sign in to comment.