summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2011-05-10 16:12:45 +0200
committerBram Moolenaar <Bram@vim.org>2011-05-10 16:12:45 +0200
commit536681be5deba615f5ebe3edc3ce85ef01830876 (patch)
tree673c46ef89b8415ea5107ef0c90577a0fb50778a
parentbb99322ef91c79adc7e6a01dec41b2edda3aec26 (diff)
updated for version 7.3.186v7.3.186
Problem: When 'clipboard' contains "unnamed" or "unnamedplus" the value of v:register is wrong for operators without a specific register. Solution: Adjust the register according to 'clipboard'. (Ingo Karkat)
-rw-r--r--src/normal.c8
-rw-r--r--src/version.c2
2 files changed, 9 insertions, 1 deletions
diff --git a/src/normal.c b/src/normal.c
index fe306675b0..d8f9415d28 100644
--- a/src/normal.c
+++ b/src/normal.c
@@ -1202,7 +1202,13 @@ getcount:
{
clearop(oap);
#ifdef FEAT_EVAL
- set_reg_var('"');
+ {
+ int regname = 0;
+ /* Adjust the register according to 'clipboard', so that when
+ * "unnamed" is present it becomes '*' or '+' instead of '"'. */
+ adjust_clip_reg(&regname);
+ set_reg_var(regname);
+ }
#endif
}
diff --git a/src/version.c b/src/version.c
index f2978cc8eb..1dfb092a61 100644
--- a/src/version.c
+++ b/src/version.c
@@ -715,6 +715,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 186,
+/**/
185,
/**/
184,