summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/ops.c10
-rw-r--r--src/version.c2
2 files changed, 11 insertions, 1 deletions
diff --git a/src/ops.c b/src/ops.c
index fbac2c24a..5d1b75f1e 100644
--- 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 08ba161aa..f55d0288c 100644
--- a/src/version.c
+++ b/src/version.c
@@ -682,6 +682,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 297,
+/**/
296,
/**/
295,