To: vim_dev@googlegroups.com Subject: Patch 8.2.3108 Fcc: outbox From: Bram Moolenaar Mime-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ------------ Patch 8.2.3108 Problem: Test for remote_foreground() fails. (Elimar Riesebieter) Solution: Check that $DISPLAY is set. (Christian Brabandt) Files: src/testdir/check.vim, src/testdir/test_clientserver.vim, src/testdir/test_vim9_builtin.vim *** ../vim-8.2.3107/src/testdir/check.vim 2021-07-03 21:37:56.330492487 +0200 --- src/testdir/check.vim 2021-07-05 14:06:24.212151205 +0200 *************** *** 136,141 **** --- 136,149 ---- endif endfunc + " Command to Check for an environment variable + command -nargs=1 CheckEnv call CheckEnv() + func CheckEnv(name) + if empty('$' .. a:name) + throw 'Skipped: Environment variable ' .. a:name .. ' is not set' + endif + endfunc + " Command to check that we are using the GUI command CheckGui call CheckGui() func CheckGui() *** ../vim-8.2.3107/src/testdir/test_clientserver.vim 2021-03-20 22:16:52.961362692 +0100 --- src/testdir/test_clientserver.vim 2021-07-05 14:05:16.756284309 +0200 *************** *** 13,21 **** func Check_X11_Connection() if has('x11') ! if empty($DISPLAY) ! throw 'Skipped: $DISPLAY is not set' ! endif try call remote_send('xxx', '') catch --- 13,19 ---- func Check_X11_Connection() if has('x11') ! CheckEnv DISPLAY try call remote_send('xxx', '') catch *** ../vim-8.2.3107/src/testdir/test_vim9_builtin.vim 2021-07-03 19:27:32.690065101 +0200 --- src/testdir/test_vim9_builtin.vim 2021-07-05 14:09:02.347842015 +0200 *************** *** 1415,1420 **** --- 1415,1422 ---- CheckFeature clientserver # remote_foreground() doesn't fail on MS-Windows CheckNotMSWindows + CheckEnv DISPLAY + CheckDefFailure(['remote_foreground(10)'], 'E1013: Argument 1: type mismatch, expected string but got number') assert_fails('remote_foreground("NonExistingServer")', 'E241:') enddef *** ../vim-8.2.3107/src/version.c 2021-07-04 23:29:26.821602887 +0200 --- src/version.c 2021-07-05 14:07:54.987973231 +0200 *************** *** 757,758 **** --- 757,760 ---- { /* Add new patch number below this line */ + /**/ + 3108, /**/ -- From "know your smileys": =):-) Uncle Sam /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\ /// \\\ \\\ sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ /// \\\ help me help AIDS victims -- http://ICCF-Holland.org ///