summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorzeertzjq <zeertzjq@outlook.com>2022-10-19 15:12:54 +0100
committerBram Moolenaar <Bram@vim.org>2022-10-19 15:12:54 +0100
commitdf63f05c3a81f726ee9fbfc4954eb675e287c7f7 (patch)
tree131cf0f1b0b9af2878bbea1f11df0805b9292e5e /src
parent060b8384888ce91b1bc194101091d0f9f85d0490 (diff)
patch 9.0.0797: order of assert function arguments is revertedv9.0.0797
Problem: Order of assert function arguments is reverted. Solution: Swap the arguments. (closes #11399)
Diffstat (limited to 'src')
-rw-r--r--src/testdir/test_termcodes.vim6
-rw-r--r--src/version.c2
2 files changed, 5 insertions, 3 deletions
diff --git a/src/testdir/test_termcodes.vim b/src/testdir/test_termcodes.vim
index 8bf2fe3c11..92bd4cd75b 100644
--- a/src/testdir/test_termcodes.vim
+++ b/src/testdir/test_termcodes.vim
@@ -1338,7 +1338,7 @@ func Test_term_mouse_popup_menu_setpos()
\ .. MouseRightReleaseCode(1, 10) .. "\<Down>\<CR>", "x")
call assert_equal([1, 1], [line('.'), col('.')], msg) " After yanking, the cursor goes to 1,1
call assert_equal("V", getregtype('"'), msg)
- call assert_equal(len(getreg('"', 1, v:true)), 1, msg)
+ call assert_equal(1, len(getreg('"', 1, v:true)), msg)
" Test for right click in multi-line line-wise visual mode inside the selection
let @" = ''
@@ -1347,7 +1347,7 @@ func Test_term_mouse_popup_menu_setpos()
\ .. MouseRightReleaseCode(2, 20) .. "\<Down>\<CR>", "x")
call assert_equal([1, 1], [line('.'), col('.')], msg) " After yanking, the cursor goes to 1,1
call assert_equal("V", getregtype('"'), msg)
- call assert_equal(len(getreg('"', 1, v:true)), 2, msg)
+ call assert_equal(2, len(getreg('"', 1, v:true)), msg)
" Test for right click in line-wise visual mode outside the selection
let @" = ''
@@ -1367,7 +1367,7 @@ func Test_term_mouse_popup_menu_setpos()
" Try clicking outside the window
let @" = ''
- call cursor(7, 2)
+ call cursor(2, 2)
call feedkeys('vee' .. MouseRightClickCode(7, 2)
\ .. MouseRightReleaseCode(7, 2) .. "\<Down>\<CR>", "x")
call assert_equal(2, winnr(), msg)
diff --git a/src/version.c b/src/version.c
index 7ee612d589..bf4994622b 100644
--- a/src/version.c
+++ b/src/version.c
@@ -696,6 +696,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 797,
+/**/
796,
/**/
795,