Fix bug in C-r after evil-change (with specified register) (#1476)

Author: tomdl89

evil-commands.el

@@ -1679,7 +1679,8 @@ of the block."
      ((eq type 'block)
       (evil-insert 1 nlines))
      (t
-      (evil-insert 1)))))
+      (evil-insert 1)))
+    (setq evil-this-register nil)))
 
 (evil-define-operator evil-change-line (beg end type register yank-handler)
   "Change to end of line, or change whole line if characterwise visual mode."

evil-tests.el

@@ -2831,7 +2831,12 @@ word3[]"))
   (ert-info ("special register :")
     (evil-test-buffer
       "[f]oo bar\n"
-      (":noh\ni\C-r:"))))
+      (":noh\ni\C-r:")))
+  (ert-info ("Paste from register during change to register")
+    (evil-test-buffer
+      "[a]lpha beta"
+      ("\"ayiw" "w" "\"bciw" "\C-ra")
+      "alpha alpha[]")))
 
 (ert-deftest evil-test-last-insert-register ()
   "Test last insertion register."