patch 8.2.3742: dec mouse test fails without gnome terminfo entry

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)

diff --git a/src/testdir/test_autochdir.vim b/src/testdir/test_autochdir.vim
index c85cc1932b06c8736b1b41cfaf8aac0471ccfd83..e7a688567631f06c54d7834f2960bbcb7d49e262 100644 (file)
--- 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 887093c8070a3e9bf95c927c96ede9af5f97b40a..614c0977d7e887411b14f6e06e0bd6f35956eacf 100644 (file)
--- 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 83326fef65e7b0586c6556ac344dbdcf2606c56a..531642ec0057e29434dcc17f1320d6ad95a30e48 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -753,6 +753,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    3742,
 /**/
     3741,
 /**/