thac0/vim
1
0
Fork 0
forked from aniani/vim
Code Activity

updated for version 7.3.498

Browse Source 
Problem:    The behavior of the "- register changes depending on value of
            the 'clipboard' option. (Szamotulski)
Solution:   Also set the "- register when the register is "*" or "+".
            (Christian Brabandt)
This commit is contained in:
Bram Moolenaar
2012-04-20 13:46:08 +02:00
parent b830f0c7df
commit 84298db3a4
2 changed files with 10 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/ops.c
View File

@@ -1720,9 +1720,14 @@ op_delete(oap)
did_yank = TRUE; did_yank = TRUE;
} }
/* Yank into small delete register when no register specified and the /* Yank into small delete register when no named register specified
* delete is within one line. */ * and the delete is within one line. */
if (oap->regname == 0 && oap->motion_type != MLINE if ((
#ifdef FEAT_CLIPBOARD
((clip_unnamed & CLIP_UNNAMED) && oap->regname == '*') ||
((clip_unnamed & CLIP_UNNAMED_PLUS) && oap->regname == '+') ||
#endif
oap->regname == 0) && oap->motion_type != MLINE
&& oap->line_count == 1) && oap->line_count == 1)
{ {
oap->regname = '-'; oap->regname = '-';

2
src/version.c
View File

@@ -714,6 +714,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 */
/**/
498,
/**/ /**/
497, 497,
/**/ /**/