summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2020-06-10 17:13:48 +0200
committerBram Moolenaar <Bram@vim.org>2020-06-10 17:13:48 +0200
commit13b8205b442f52f34deac98e3312a27dec14d8e2 (patch)
treea3a97a5ae432b51a9bda36f12cf67f90345bb6c5
parentea1233fccf4f52f2b4eaab3788a087878d1336fc (diff)
downloadvim-git-13b8205b442f52f34deac98e3312a27dec14d8e2.tar.gz
patch 8.2.0950: tagjump test failsv8.2.0950
Problem: Tagjump test fails. Solution: Adjust expected text of the prompt.
-rw-r--r--src/testdir/test_tagjump.vim2
-rw-r--r--src/version.c2
2 files changed, 3 insertions, 1 deletions
diff --git a/src/testdir/test_tagjump.vim b/src/testdir/test_tagjump.vim
index fa825c7dc..0a69a8d3a 100644
--- a/src/testdir/test_tagjump.vim
+++ b/src/testdir/test_tagjump.vim
@@ -1031,7 +1031,7 @@ func Test_tselect_listing()
2 FS v first Xfoo
typeref:typename:char
2
-Type number and <Enter> (empty cancels):
+Type number and <Enter> (q or empty cancels):
[DATA]
call assert_equal(expected, l)
diff --git a/src/version.c b/src/version.c
index 52d655cbc..abf9f6860 100644
--- a/src/version.c
+++ b/src/version.c
@@ -755,6 +755,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 950,
+/**/
949,
/**/
948,