updated for version 7.2-297

diff --git a/src/ops.c b/src/ops.c
index fbac2c24a252f6cf8a8f30ee16a2daa18ec9d67a..5d1b75f1ec579877ee4885b225b7fbf0446e0553 100644 (file)
--- a/src/ops.c
+++ b/src/ops.c
@@ -3991,6 +3991,14 @@ ex_display(eap)
        }
        else
            yb = &(y_regs[i]);
+
+#ifdef FEAT_EVAL
+       if (name == MB_TOLOWER(redir_reg)
+               || (redir_reg == '"' && yb == y_previous))
+           continue;       /* do not list register being written to, the
+                            * pointer can be freed */
+#endif
+
        if (yb->y_array != NULL)
        {
            msg_putchar('\n');
@@ -6090,7 +6098,7 @@ str_to_reg(y_ptr, type, str, len, blocklen)
     long       maxlen;
 #endif
 
-    if (y_ptr->y_array == NULL)                /* NULL means emtpy register */
+    if (y_ptr->y_array == NULL)                /* NULL means empty register */
        y_ptr->y_size = 0;
 
     /*

diff --git a/src/version.c b/src/version.c
index 08ba161aa41b66b1294808dc7616c6649cb1aede..f55d0288c0bfe43c4fb7068298e695e628af96e1 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -681,6 +681,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    297,
 /**/
     296,
 /**/