diff options
author | Bram Moolenaar <Bram@vim.org> | 2017-03-01 18:30:34 +0100 |
---|---|---|
committer | Bram Moolenaar <Bram@vim.org> | 2017-03-01 18:30:34 +0100 |
commit | f8ab1b14fd972a093e0c12146dd3becd511eb519 (patch) | |
tree | 8315232533c5788867675c0099d3e1befd6fc65a | |
parent | abc39ab642791ae3d22a524516eeedb673a95d9d (diff) | |
download | vim-git-f8ab1b14fd972a093e0c12146dd3becd511eb519.tar.gz |
patch 8.0.0395: testing the + register fails with Motifv8.0.0395
Problem: Testing the + register fails with Motif.
Solution: Also ignore the "failed to create input context" error in the
second gvim. Don't use msg() when it would result in a dialog.
-rw-r--r-- | src/message.c | 3 | ||||
-rw-r--r-- | src/testdir/setup_gui.vim | 3 | ||||
-rw-r--r-- | src/testdir/test_gui.vim | 12 | ||||
-rw-r--r-- | src/version.c | 2 |
4 files changed, 13 insertions, 7 deletions
diff --git a/src/message.c b/src/message.c index 985e1ebbf..ab193f085 100644 --- a/src/message.c +++ b/src/message.c @@ -605,7 +605,8 @@ emsg(char_u *s) #ifdef FEAT_EVAL /* When testing some errors are turned into a normal message. */ if (ignore_error(s)) - return msg(s); + /* don't call msg() if it results in a dialog */ + return msg_use_printf() ? FALSE : msg(s); #endif called_emsg = TRUE; diff --git a/src/testdir/setup_gui.vim b/src/testdir/setup_gui.vim index 88f538e0d..90ef1f1de 100644 --- a/src/testdir/setup_gui.vim +++ b/src/testdir/setup_gui.vim @@ -27,3 +27,6 @@ endfunc func GUITearDownCommon() call delete('Xhome', 'rf') endfunc + +" Ignore the "failed to create input context" error. +call test_ignore_error('E285') diff --git a/src/testdir/test_gui.vim b/src/testdir/test_gui.vim index 6c9722dac..be3e52deb 100644 --- a/src/testdir/test_gui.vim +++ b/src/testdir/test_gui.vim @@ -17,9 +17,6 @@ endfunc " Test for resetting "secure" flag after GUI has started. " Must be run first. func Test_1_set_secure() - " Ignore the "failed to create input context" error. - call test_ignore_error('E285') - set exrc secure gui -f call assert_equal(1, has('gui_running')) @@ -87,13 +84,16 @@ func Test_quoteplus() let test_response = 'Yes, I can.' let vim_exe = exepath(v:progpath) let testee = 'VIMRUNTIME=' . $VIMRUNTIME . '; export VIMRUNTIME;' - \ . vim_exe . ' -f -g -u NONE -U NONE --noplugin -c ''%s''' - let cmd = 'call feedkeys("' + \ . vim_exe + \ . ' -f -g -u NONE -U NONE --noplugin --cmd ''%s'' -c ''%s''' + " Ignore the "failed to create input context" error. + let cmd1 = 'call test_ignore_error("E285")' + let cmd2 = 'call feedkeys("' \ . '\"+p' \ . ':s/' . test_call . '/' . test_response . '/\<CR>' \ . '\"+yis' \ . ':q!\<CR>", "tx")' - let run_vimtest = printf(testee, cmd) + let run_vimtest = printf(testee, cmd1, cmd2) " Set the quoteplus register to test_call, and another gvim will launched. " Then, it first tries to paste the content of its own quotedplus register diff --git a/src/version.c b/src/version.c index ee828fdc8..796162be8 100644 --- a/src/version.c +++ b/src/version.c @@ -765,6 +765,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 395, +/**/ 394, /**/ 393, |