From 439c036ed062de1c87cc7e3fe050a9569fb12089 Mon Sep 17 00:00:00 2001
From: Bram Moolenaar <Bram@vim.org>
Date: Sat, 6 Jun 2020 15:58:03 +0200
Subject: patch 8.2.0913: code for resetting v:register is duplicated

Problem:    Code for resetting v:register is duplicated.
Solution:   Add reset_reg_var().
---
 src/evalvars.c         | 20 +++++++++++++++++++-
 src/main.c             |  7 +------
 src/normal.c           | 11 +----------
 src/proto/evalvars.pro |  1 +
 src/version.c          |  2 ++
 5 files changed, 24 insertions(+), 17 deletions(-)

diff --git a/src/evalvars.c b/src/evalvars.c
index e7a1b6d7c..8b3ce2e90 100644
--- a/src/evalvars.c
+++ b/src/evalvars.c
@@ -244,7 +244,9 @@ evalvars_init(void)
 
     set_vim_var_nr(VV_ECHOSPACE,    sc_col - 1);
 
-    set_reg_var(0);  // default for v:register is not 0 but '"'
+    // Default for v:register is not 0 but '"'.  This is adjusted once the
+    // clipboard has been setup by calling reset_reg_var().
+    set_reg_var(0);
 }
 
 #if defined(EXITFREE) || defined(PROTO)
@@ -2191,6 +2193,22 @@ set_argv_var(char **argv, int argc)
     set_vim_var_list(VV_ARGV, l);
 }
 
+/*
+ * Reset v:register, taking the 'clipboard' setting into account.
+ */
+    void
+reset_reg_var(void)
+{
+    int regname = 0;
+
+    // Adjust the register according to 'clipboard', so that when
+    // "unnamed" is present it becomes '*' or '+' instead of '"'.
+#ifdef FEAT_CLIPBOARD
+    adjust_clip_reg(&regname);
+#endif
+    set_reg_var(regname);
+}
+
 /*
  * Set v:register if needed.
  */
diff --git a/src/main.c b/src/main.c
index 201ed3721..d66cd0c88 100644
--- a/src/main.c
+++ b/src/main.c
@@ -826,12 +826,7 @@ vim_main2(void)
     // done after the clipboard is available and all initial commands that may
     // modify the 'clipboard' setting have run; i.e. just before entering the
     // main loop.
-    {
-	int default_regname = 0;
-
-	adjust_clip_reg(&default_regname);
-	set_reg_var(default_regname);
-    }
+    reset_reg_var();
 #endif
 
 #if defined(FEAT_DIFF)
diff --git a/src/normal.c b/src/normal.c
index f4001411d..e3523546b 100644
--- a/src/normal.c
+++ b/src/normal.c
@@ -1080,16 +1080,7 @@ getcount:
     {
 	clearop(oap);
 #ifdef FEAT_EVAL
-	{
-	    int regname = 0;
-
-	    // Adjust the register according to 'clipboard', so that when
-	    // "unnamed" is present it becomes '*' or '+' instead of '"'.
-# ifdef FEAT_CLIPBOARD
-	    adjust_clip_reg(&regname);
-# endif
-	    set_reg_var(regname);
-	}
+	reset_reg_var();
 #endif
     }
 
diff --git a/src/proto/evalvars.pro b/src/proto/evalvars.pro
index 0d2e7b40d..97641b5ab 100644
--- a/src/proto/evalvars.pro
+++ b/src/proto/evalvars.pro
@@ -46,6 +46,7 @@ void set_vim_var_string(int idx, char_u *val, int len);
 void set_vim_var_list(int idx, list_T *val);
 void set_vim_var_dict(int idx, dict_T *val);
 void set_argv_var(char **argv, int argc);
+void reset_reg_var(void);
 void set_reg_var(int c);
 char_u *v_exception(char_u *oldval);
 char_u *v_throwpoint(char_u *oldval);
diff --git a/src/version.c b/src/version.c
index ea3f6a4e1..2b9bd7732 100644
--- a/src/version.c
+++ b/src/version.c
@@ -754,6 +754,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    913,
 /**/
     912,
 /**/
-- 
cgit v1.2.1