From fe5dc266483aa4878b30ecc660b5401648545f27 Mon Sep 17 00:00:00 2001
From: Jan Edmund Lazo <jan.lazo@mail.utoronto.ca>
Date: Wed, 25 Nov 2020 21:59:54 -0500
Subject: [PATCH] vim-patch:8.2.0462: previewwindow test fails on some systems
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Problem:    Previewwindow test fails on some systems. (James McCoy)
Solution:   Wait a bit after sending the "o". (closes vim/vim#5849)
https://github.com/vim/vim/commit/37bb030cd9088ee66dc2d41c2d3602d1e5f4a7ef

Cherry-pick Test_popup_and_previewwindow_dump() changes
from patches 8.1.1585, 8.1.2373.

N/A patches for version.c:

vim-patch:8.2.0242: preview popup window test fails with long directory name

Problem:    Preview popup window test fails with long directory name. (Jakub
            Kądziołka)
Solution:   Use "silent cd". (closes vim/vim#5615)
https://github.com/vim/vim/commit/799439a5d85a7d45eff7485056f2798cea766300

vim-patch:8.2.2042: build failure with +profile but without +reltime

Problem:    Build failure with +profile but without +reltime.
Solution:   Adjust #ifdef. (Christian Brabandt, closes vim/vim#7361)
https://github.com/vim/vim/commit/813196784ad2a3a8cd65be5e975769d9768a728e

vim-patch:8.2.2043: GTK3: white border around text stands out

Problem:    GTK3: white border around text stands out.
Solution:   Use current theme color. (closes vim/vim#7357, issue vim/vim#349)
https://github.com/vim/vim/commit/ff94bd9e4779b918f3761035f43a97ba7175b3ce

vim-patch:8.2.2047: Amiga: FEAT_ARP defined when it should not

Problem:    Amiga: FEAT_ARP defined when it should not.
Solution:   Adjust #ifdef. (Ola Söder, closes vim/vim#7370)
https://github.com/vim/vim/commit/36fe7b287e13a7534c9aa6dcf0c3d7f8363f6060

vim-patch:8.2.2048: Amiga: obsolete code

Problem:    Amiga: obsolete code.
Solution:   Remove the unused lines. (Ola Söder, closes vim/vim#7373)
https://github.com/vim/vim/commit/3a3b6910421ee1d03c222efc62d61b9fb879d931

vim-patch:8.2.2049: Amiga: obsolete function

Problem:    Amiga: obsolete function.
Solution:   Remove the function. (Ola Söder, closes vim/vim#7374)
https://github.com/vim/vim/commit/d653293c806c8bea976737b88006264e7a8ea6d6

vim-patch:8.2.2054: Amiga: FEAT_ARP defined when it should not

Problem:    Amiga: FEAT_ARP defined when it should not.
Solution:   Adjust "||" to "&&" in #ifdef. (Ola Söder, closes vim/vim#7375)
https://github.com/vim/vim/commit/d49a35a1c3b736637733b36011fccbee7ef43fcf
---
 src/nvim/testdir/test_popup.vim | 27 ++++++++++++++++-----------
 1 file changed, 16 insertions(+), 11 deletions(-)

diff --git a/src/nvim/testdir/test_popup.vim b/src/nvim/testdir/test_popup.vim
index fb464d95ea..4ee16558a0 100644
--- a/src/nvim/testdir/test_popup.vim
+++ b/src/nvim/testdir/test_popup.vim
@@ -735,20 +735,25 @@ func Test_popup_and_preview_autocommand()
 endfunc
 
 func Test_popup_and_previewwindow_dump()
-  if !CanRunVimInTerminal()
-    return
-  endif
-  call writefile([
-    \ 'set previewheight=9',
-    \ 'silent! pedit',
-    \ 'call setline(1, map(repeat(["ab"], 10), "v:val. v:key"))',
-    \ 'exec "norm! G\<C-E>\<C-E>"',
-	\ ], 'Xscript')
+  CheckScreendump
+  CheckFeature quickfix
+
+  let lines =<< trim END
+    set previewheight=9
+    silent! pedit
+    call setline(1, map(repeat(["ab"], 10), "v:val .. v:key"))
+    exec "norm! G\<C-E>\<C-E>"
+  END
+  call writefile(lines, 'Xscript')
   let buf = RunVimInTerminal('-S Xscript', {})
 
+  " wait for the script to finish
+  call term_wait(buf)
+
   " Test that popup and previewwindow do not overlap.
-  call term_sendkeys(buf, "o\<C-X>\<C-N>")
-  sleep 100m
+  call term_sendkeys(buf, "o")
+  call term_wait(buf, 100)
+  call term_sendkeys(buf, "\<C-X>\<C-N>")
   call VerifyScreenDump(buf, 'Test_popup_and_previewwindow_01', {})
 
   call term_sendkeys(buf, "\<Esc>u")