diff --git a/src/ex_getln.c b/src/ex_getln.c
index 18a708bf98..11571d1946 100644
--- a/src/ex_getln.c
+++ b/src/ex_getln.c
@@ -4379,11 +4379,6 @@ set_cmd_context(xp, str, len, col)
     int		old_char = NUL;
     char_u	*nextcomm;
 
-    /* Store the string here so that call_user_expand_func() can get to them
-     * easily. */
-    xp->xp_line = str;
-    xp->xp_col = col;
-
     /*
      * Avoid a UMR warning from Purify, only save the character if it has been
      * written before.
@@ -4414,6 +4409,11 @@ set_cmd_context(xp, str, len, col)
 	while (nextcomm != NULL)
 	    nextcomm = set_one_cmd_context(xp, nextcomm);
 
+    /* Store the string here so that call_user_expand_func() can get to them
+     * easily. */
+    xp->xp_line = str;
+    xp->xp_col = col;
+
     str[col] = old_char;
 }
 
diff --git a/src/version.c b/src/version.c
index 18588e8c45..3a0b367387 100644
--- a/src/version.c
+++ b/src/version.c
@@ -728,6 +728,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    1271,
 /**/
     1270,
 /**/