aniani/vim
0
0
Fork 1
mirror of https://github.com/vim/vim.git synced 2025-09-23 03:43:49 -04:00
Code Activity

updated for version 7.3.649

Browse Source 
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)
This commit is contained in:
Bram Moolenaar
2012-09-05 14:18:45 +02:00
parent 2c66669c33
commit 7c82130a76
2 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/ops.c
View File

@@ -1623,6 +1623,7 @@ op_delete(oap)
#endif #endif
linenr_T old_lcount = curbuf->b_ml.ml_line_count; linenr_T old_lcount = curbuf->b_ml.ml_line_count;
int did_yank = FALSE; int did_yank = FALSE;
int orig_regname = oap->regname;
if (curbuf->b_ml.ml_flags & ML_EMPTY) /* nothing to do */ if (curbuf->b_ml.ml_flags & ML_EMPTY) /* nothing to do */
return OK; return OK;
@@ -1715,8 +1716,10 @@ op_delete(oap)
/* /*
* Put deleted text into register 1 and shift number registers if the * Put deleted text into register 1 and shift number registers if the
* delete contains a line break, or when a regname has been specified. * 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) || oap->line_count > 1 || oap->use_reg_one)
{ {
y_current = &y_regs[9]; y_current = &y_regs[9];

2
src/version.c
View File

@@ -719,6 +719,8 @@ static char *(features[]) =
static int included_patches[] = static int included_patches[] =
{ /* Add new patch number below this line */ { /* Add new patch number below this line */
/**/
649,
/**/ /**/
648, 648,
/**/ /**/