summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--src/ex_cmds.c9
-rw-r--r--src/testdir/test_buffer.vim7
-rw-r--r--src/version.c2
3 files changed, 16 insertions, 2 deletions
diff --git a/src/ex_cmds.c b/src/ex_cmds.c
index 9fdbe955e0..265927c4cd 100644
--- a/src/ex_cmds.c
+++ b/src/ex_cmds.c
@@ -2651,8 +2651,13 @@ do_ecmd(
// with the current window.
newbuf = buflist_new(ffname, sfname, tlnum,
BLN_LISTED | BLN_NOCURWIN);
- if (newbuf != NULL && (flags & ECMD_ALTBUF))
- curwin->w_alt_fnum = newbuf->b_fnum;
+ if (newbuf != NULL)
+ {
+ if (flags & ECMD_ALTBUF)
+ curwin->w_alt_fnum = newbuf->b_fnum;
+ if (tlnum > 0)
+ newbuf->b_last_cursor.lnum = tlnum;
+ }
goto theend;
}
buf = buflist_new(ffname, sfname, 0L,
diff --git a/src/testdir/test_buffer.vim b/src/testdir/test_buffer.vim
index 9387b5f6c4..bc29c21621 100644
--- a/src/testdir/test_buffer.vim
+++ b/src/testdir/test_buffer.vim
@@ -361,6 +361,13 @@ func Test_badd_options()
close
close
bwipe! SomeNewBuffer
+
+ badd +3 XbaddFile
+ call writefile(range(6), 'XbaddFile', 'D')
+ buf XbaddFile
+ call assert_equal([0, 3, 1, 0], getpos('.'))
+
+ bwipe! XbaddFile
endfunc
func Test_balt()
diff --git a/src/version.c b/src/version.c
index 9de0676177..15f5e38544 100644
--- a/src/version.c
+++ b/src/version.c
@@ -700,6 +700,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 506,
+/**/
505,
/**/
504,