summaryrefslogtreecommitdiffstats
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
commitcaf2dffd5142f93c75367e3af99e52df7abf73cd (patch)
tree122538c2eb69f2e70f43be6c9bf419b42c9e404a
parent5e6d5ca16c8d35abd28fdeb7f2600ce5e8aeacc1 (diff)
updated for version 7.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 eaad703e6a..ab3d636cdc 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 d661c64363..e03d81b061 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,