summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/ops.c4
-rw-r--r--src/version.c2
2 files changed, 5 insertions, 1 deletions
diff --git a/src/ops.c b/src/ops.c
index 57c4b0adb..eaad703e6 100644
--- a/src/ops.c
+++ b/src/ops.c
@@ -3497,7 +3497,9 @@ do_put(regname, dir, count, flags)
#endif
if (dir == FORWARD)
++lnum;
- if (u_save(lnum - 1, lnum) == FAIL)
+ /* In an empty buffer the empty line is going to be replaced, include
+ * it in the saved lines. */
+ if ((bufempty() ? u_save(0, 1) : u_save(lnum - 1, lnum)) == FAIL)
goto end;
#ifdef FEAT_FOLDING
if (dir == FORWARD)
diff --git a/src/version.c b/src/version.c
index 8022a78f3..18588e8c4 100644
--- a/src/version.c
+++ b/src/version.c
@@ -729,6 +729,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 1270,
+/**/
1269,
/**/
1268,