summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDominique Pelle <dominique.pelle@gmail.com>2021-12-05 12:39:21 +0000
committerBram Moolenaar <Bram@vim.org>2021-12-05 12:39:21 +0000
commitf589fd3e1047cdf90566b68aaf9a13389e54d26a (patch)
treead53cdd766f6680f28b1098c8b951013d3281099
parente031fe90cf2e375ce861ff5e5e281e4ad229ebb9 (diff)
downloadvim-git-f589fd3e1047cdf90566b68aaf9a13389e54d26a.tar.gz
patch 8.2.3742: dec mouse test fails without gnome terminfo entryv8.2.3742
Problem: Dec mouse test fails without gnome terminfo entry. Solution: Check if there is a gnome entry. Also fix 'acd' test on MS-Windows. (Dominique Pellé, closes #9282)
-rw-r--r--src/testdir/test_autochdir.vim6
-rw-r--r--src/testdir/test_termcodes.vim4
-rw-r--r--src/version.c2
3 files changed, 9 insertions, 3 deletions
diff --git a/src/testdir/test_autochdir.vim b/src/testdir/test_autochdir.vim
index c85cc1932..e7a688567 100644
--- a/src/testdir/test_autochdir.vim
+++ b/src/testdir/test_autochdir.vim
@@ -43,12 +43,12 @@ func Test_set_filename_other_window()
finally
set noacd
call chdir(cwd)
- call delete('Xa', 'rf')
- call delete('Xb', 'rf')
- call delete('Xc', 'rf')
bwipe! aaa.txt
bwipe! bbb.txt
bwipe! ccc.txt
+ call delete('Xa', 'rf')
+ call delete('Xb', 'rf')
+ call delete('Xc', 'rf')
endtry
endfunc
diff --git a/src/testdir/test_termcodes.vim b/src/testdir/test_termcodes.vim
index 887093c80..614c0977d 100644
--- a/src/testdir/test_termcodes.vim
+++ b/src/testdir/test_termcodes.vim
@@ -2041,6 +2041,10 @@ endfunc
" Check that when DEC mouse codes are recognized a special key is handled.
func Test_ignore_dec_mouse()
+ silent !infocmp gnome >/dev/null 2>&1
+ if v:shell_error != 0
+ throw 'Skipped: gnome entry missing in the terminfo db'
+ endif
new
let save_mouse = &mouse
diff --git a/src/version.c b/src/version.c
index 83326fef6..531642ec0 100644
--- a/src/version.c
+++ b/src/version.c
@@ -754,6 +754,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 3742,
+/**/
3741,
/**/
3740,