summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBram Moolenaar <bram@vim.org>2013-07-03 14:19:54 +0200
committerBram Moolenaar <bram@vim.org>2013-07-03 14:19:54 +0200
commitb5cf5f2e1aef26aa009ec292febd86dc30715f1a (patch)
treeb0a3eaeacad4d682c30112151d554e03a291c36b
parentbbdc28fdf37b2eeebb116070bc55066cf727b80d (diff)
downloadvim-b5cf5f2e1aef26aa009ec292febd86dc30715f1a.tar.gz
updated for version 7.3.1293v7.3.1293v7-3-1293
Problem: Put in empty buffer cannot be undone. Solution: Save one more line for undo. (Ozaki)
-rw-r--r--src/ops.c2
-rw-r--r--src/version.c2
2 files changed, 3 insertions, 1 deletions
diff --git a/src/ops.c b/src/ops.c
index eaad703e..ab3d636c 100644
--- a/src/ops.c
+++ b/src/ops.c
@@ -3499,7 +3499,7 @@ do_put(regname, dir, count, flags)
++lnum;
/* 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)
+ if ((bufempty() ? u_save(0, 2) : 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 d661c643..e03d81b0 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 */
/**/
+ 1293,
+/**/
1292,
/**/
1291,