summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2020-01-30 19:39:04 +0100
committerBram Moolenaar <Bram@vim.org>2020-01-30 19:39:04 +0100
commit92be6e3f46120bb8e6c8fca0a7868a08df8b3345 (patch)
tree85aedf2f292debc8069ac5eebbff41df97e02443 /src
parent5feabe00c47fa66d5f4c95213f150488433f78e3 (diff)
patch 8.2.0184: blob test failsv8.2.0184
Problem: Blob test fails. Solution: Check for different error when float feature is missing.
Diffstat (limited to 'src')
-rw-r--r--src/testdir/test_blob.vim6
-rw-r--r--src/version.c2
2 files changed, 7 insertions, 1 deletions
diff --git a/src/testdir/test_blob.vim b/src/testdir/test_blob.vim
index 47c09e79f9..79fdf44465 100644
--- a/src/testdir/test_blob.vim
+++ b/src/testdir/test_blob.vim
@@ -324,5 +324,9 @@ func Test_blob_lock()
endfunc
func Test_blob_sort()
- call assert_fails('call sort(["abc", 0z11], "f")', 'E702:')
+ if has('float')
+ call assert_fails('call sort([1.0, 0z11], "f")', 'E975:')
+ else
+ call assert_fails('call sort(["abc", 0z11], "f")', 'E702:')
+ endif
endfunc
diff --git a/src/version.c b/src/version.c
index 4bffa7b137..0c30f25684 100644
--- a/src/version.c
+++ b/src/version.c
@@ -743,6 +743,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 184,
+/**/
183,
/**/
182,