feat(userregs): make the @" register call back into the userreg.

Before this changce, the userregs would not be repeated with @", now
they can be. There is still the problem of repeating with a count does
not call into the userreg, but that would be a lot of work to implement

3 files changed, 6 insertions, 4 deletions

diff --git a/src/nvim/ops.c b/src/nvim/ops.c
index 889cc4f5bc..fe1496e2d4 100644
--- a/src/nvim/ops.c
+++ b/src/nvim/ops.c
@@ -995,6 +995,10 @@ yankreg_T *get_yank_register(int regname, int mode)
              && (regname == 0 || regname == '"' || regname == '*' || regname == '+')
              && y_previous != NULL) {
     // in case clipboard not available, paste from previous used register
+    if (get_userreg(y_previous->name) != -1) {
+      // If y_previous is a userreg, repeat the userreg copy.
+      copy_userreg(y_previous, y_previous->name);
+    }
     return y_previous;
   }
 
@@ -3410,10 +3414,6 @@ void do_put(int regname, yankreg_T *reg, int dir, long count, int flags)
       reg = get_yank_register(regname, YREG_PASTE);
     }
 
-    if (get_userreg(regname) != -1)  {
-      copy_userreg(reg, regname);
-    }
-
     y_type = reg->y_type;
     y_width = reg->y_width;
     y_size = reg->y_size;
diff --git a/src/nvim/ops.h b/src/nvim/ops.h
index a456d68003..69fc8572cf 100644
--- a/src/nvim/ops.h
+++ b/src/nvim/ops.h
@@ -90,6 +90,7 @@ typedef struct yankreg {
   colnr_T y_width;          ///< Register width (only valid for y_type == kBlockWise).
   Timestamp timestamp;      ///< Time when register was last modified.
   dict_T *additional_data;  ///< Additional data from ShaDa file.
+  int name;
 } yankreg_T;
 
 /// Modes for get_yank_register()
diff --git a/src/nvim/yankmap.c b/src/nvim/yankmap.c
index d9229e015d..c5b8ca8838 100644
--- a/src/nvim/yankmap.c
+++ b/src/nvim/yankmap.c
@@ -18,6 +18,7 @@ yankreg_T* yankmap_get(yankmap_T* yankmap, int reg)
   if (ret) {
     if (! (*ret)) {
       *ret = xcalloc(sizeof(yankreg_T), 1);
+      (*ret)->name = reg;
     }
 
     /* Add the back-reference */