patch 9.0.1354: "gr CTRL-G" stays in virtual replace mode

Problem:    "gr CTRL-G" stays in virtual replace mode. (Pierre Ganty)
Solution:   Prepend CTRL-V before control characters. (closes #12045)

src/edit.c

@@ -3527,6 +3527,10 @@ ins_ctrl_g(void)
 		  dont_sync_undo = MAYBE;
 		  break;
 
+	case ESC:
+		  // Esc after CTRL-G cancels it.
+		  break;
+
 	// Unknown CTRL-G command, reserved for future expansion.
 	default:  vim_beep(BO_CTRLG);
     }

src/normal.c

@@ -5033,6 +5033,10 @@ nv_vreplace(cmdarg_T *cap)
     {
 	if (cap->extra_char == Ctrl_V)	// get another character
 	    cap->extra_char = get_literal(FALSE);
+	if (cap->extra_char < ' ')
+	    // Prefix a control character with CTRL-V to avoid it being used as
+	    // a command.
+	    stuffcharReadbuff(Ctrl_V);
 	stuffcharReadbuff(cap->extra_char);
 	stuffcharReadbuff(ESC);
 	if (virtual_active())

src/testdir/test_edit.vim

@@ -2068,8 +2068,12 @@ endfunc
 func Test_edit_gr_special()
   enew
   call setline(1, ['abcdef', 'xxxxxx'])
-  exe "normal! gr\<C-O>x"
+  exe "normal! gr\<C-O>lx"
-  call assert_equal('bcdef', getline(1))
+  call assert_equal("\<C-O>def", getline(1))
+
+  call setline(1, 'abcdef')
+  exe "normal! 0gr\<C-G>lx"
+  call assert_equal("\<C-G>def", getline(1))
 
   bwipe!
 endfunc

src/version.c

@@ -695,6 +695,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    1354,
 /**/
     1353,
 /**/