updated for version 7.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)

diff --git a/src/normal.c b/src/normal.c
index fe306675b0a3e95d718c0c76b6d2c56666740fb5..d8f9415d285cf1681a4bae644d824f7f7f73700f 100644 (file)
--- 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 f2978cc8ebdeada7c937e4861ec5bc219be18091..1dfb092a61f6e00b723a5b51935166a0f746a6f9 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -714,6 +714,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    186,
 /**/
     185,
 /**/