summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2020-06-10 16:39:32 +0200
committerBram Moolenaar <Bram@vim.org>2020-06-10 16:39:32 +0200
commitd281b7c227bc4c78813fdc297ccee4b2cad7e605 (patch)
tree62bc328c72ac6f1e6479b00a52cf16ca32fb0c61
parentab54032f297e9418b0d83970cbe3a414d6ef08c4 (diff)
downloadvim-git-d281b7c227bc4c78813fdc297ccee4b2cad7e605.tar.gz
patch 8.2.0948: spell test failsv8.2.0948
Problem: Spell test fails. Solution: Adjust expected text of the prompt.
-rw-r--r--src/testdir/test_spell.vim6
-rw-r--r--src/version.c2
2 files changed, 5 insertions, 3 deletions
diff --git a/src/testdir/test_spell.vim b/src/testdir/test_spell.vim
index 7cc209bc8..aee51c778 100644
--- a/src/testdir/test_spell.vim
+++ b/src/testdir/test_spell.vim
@@ -252,7 +252,7 @@ func Test_spellsuggest_option_number()
\ .. "Change \"baord\" to:\n"
\ .. " 1 \"board\"\n"
\ .. " 2 \"bard\"\n"
- \ .. "Type number and <Enter> or click with mouse (empty cancels): ", a)
+ \ .. "Type number and <Enter> or click with the mouse (q or empty cancels): ", a)
set spell spellsuggest=0
call assert_equal("\nSorry, no suggestions", execute('norm $z='))
@@ -290,7 +290,7 @@ func Test_spellsuggest_option_expr()
\ .. " 1 \"BARD\"\n"
\ .. " 2 \"BOARD\"\n"
\ .. " 3 \"BROAD\"\n"
- \ .. "Type number and <Enter> or click with mouse (empty cancels): ", a)
+ \ .. "Type number and <Enter> or click with the mouse (q or empty cancels): ", a)
" With verbose, z= should show the score i.e. word length with
" our SpellSuggest() function.
@@ -302,7 +302,7 @@ func Test_spellsuggest_option_expr()
\ .. " 1 \"BARD\" (4 - 0)\n"
\ .. " 2 \"BOARD\" (5 - 0)\n"
\ .. " 3 \"BROAD\" (5 - 0)\n"
- \ .. "Type number and <Enter> or click with mouse (empty cancels): ", a)
+ \ .. "Type number and <Enter> or click with the mouse (q or empty cancels): ", a)
set spell& spellsuggest& verbose&
bwipe!
diff --git a/src/version.c b/src/version.c
index b0a0669bb..20d508157 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 */
/**/
+ 948,
+/**/
947,
/**/
946,