summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/ops.c8
-rw-r--r--src/version.c2
2 files changed, 10 insertions, 0 deletions
diff --git a/src/ops.c b/src/ops.c
index 856133c8..090d3f89 100644
--- a/src/ops.c
+++ b/src/ops.c
@@ -6642,6 +6642,14 @@ str_to_reg(y_ptr, yank_type, str, len, blocklen, str_list)
}
}
+ /* Without any lines make the register empty. */
+ if (y_ptr->y_size + newlines == 0)
+ {
+ vim_free(y_ptr->y_array);
+ y_ptr->y_array = NULL;
+ return;
+ }
+
/*
* Allocate an array to hold the pointers to the new register lines.
* If the register was not empty, move the existing lines to the new array.
diff --git a/src/version.c b/src/version.c
index ba5f30e2..822da623 100644
--- a/src/version.c
+++ b/src/version.c
@@ -742,6 +742,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 725,
+/**/
724,
/**/
723,