vim-patch:8.1.2373: cannot build with +popupwin but without +quickfix

Problem:    Cannot build with +popupwin but without +quickfix. (John Marriott)
Solution:   Adjust #ifdefs.

https://github.com/vim/vim/commit/5a4c3082d7ab51b3d448a91578479c96c1ab0ad3

Co-authored-by: Bram Moolenaar <Bram@vim.org>

11 files changed, 40 insertions, 13 deletions

diff --git a/test/old/testdir/test_autocmd.vim b/test/old/testdir/test_autocmd.vim
index 632173e870..c2f7dbd28d 100644
--- a/test/old/testdir/test_autocmd.vim
+++ b/test/old/testdir/test_autocmd.vim
@@ -3028,6 +3028,8 @@ func Test_autocmd_CmdWinEnter()
 endfunc
 
 func Test_autocmd_was_using_freed_memory()
+  CheckFeature quickfix
+
   pedit xx
   n x
   augroup winenter
diff --git a/test/old/testdir/test_bufwintabinfo.vim b/test/old/testdir/test_bufwintabinfo.vim
index 63f4fe6bb0..57492e07c9 100644
--- a/test/old/testdir/test_bufwintabinfo.vim
+++ b/test/old/testdir/test_bufwintabinfo.vim
@@ -1,6 +1,9 @@
 " Tests for the getbufinfo(), getwininfo() and gettabinfo() functions
+source check.vim
+
+func Test_getbufwintabinfo()
+  CheckFeature quickfix
 
-function Test_getbufwintabinfo()
   edit Xtestfile1
   edit Xtestfile2
   let buflist = getbufinfo()
@@ -109,7 +112,7 @@ function Test_getbufwintabinfo()
   call assert_true(winlist[2].quickfix)
   call assert_false(winlist[2].loclist)
   wincmd t | only
-endfunction
+endfunc
 
 function Test_get_buf_options()
   let opts = bufnr()->getbufvar('&')
diff --git a/test/old/testdir/test_edit.vim b/test/old/testdir/test_edit.vim
index a0bc38a8fc..3fe65832c9 100644
--- a/test/old/testdir/test_edit.vim
+++ b/test/old/testdir/test_edit.vim
@@ -1137,6 +1137,8 @@ func Test_edit_CTRL_V()
 endfunc
 
 func Test_edit_F1()
+  CheckFeature quickfix
+
   " Pressing <f1>
   new
   " call feedkeys(":set im\<cr>\<f1>\<c-l>", 'tnix')
diff --git a/test/old/testdir/test_execute_func.vim b/test/old/testdir/test_execute_func.vim
index 61971ec587..2edae39b8f 100644
--- a/test/old/testdir/test_execute_func.vim
+++ b/test/old/testdir/test_execute_func.vim
@@ -124,6 +124,8 @@ func Test_win_execute()
 endfunc
 
 func Test_win_execute_update_ruler()
+  CheckFeature quickfix
+
   enew
   call setline(1, range(500))
   20
diff --git a/test/old/testdir/test_filter_cmd.vim b/test/old/testdir/test_filter_cmd.vim
index dae164b11c..b84081e384 100644
--- a/test/old/testdir/test_filter_cmd.vim
+++ b/test/old/testdir/test_filter_cmd.vim
@@ -1,5 +1,7 @@
 " Test the :filter command modifier
 
+source check.vim
+
 func Test_filter()
   edit Xdoesnotmatch
   edit Xwillmatch
@@ -97,6 +99,8 @@ func Test_filter_cmd_with_filter()
 endfunction
 
 func Test_filter_commands()
+  CheckFeature quickfix
+
   let g:test_filter_a = 1
   let b:test_filter_b = 2
   let test_filter_c = 3
diff --git a/test/old/testdir/test_makeencoding.vim b/test/old/testdir/test_makeencoding.vim
index e297bdc228..0a49fba755 100644
--- a/test/old/testdir/test_makeencoding.vim
+++ b/test/old/testdir/test_makeencoding.vim
@@ -1,7 +1,9 @@
 " Tests for 'makeencoding'.
 
 source shared.vim
+source check.vim
 
+CheckFeature quickfix
 let s:python = PythonProg()
 if s:python == ''
   throw 'Skipped: python program missing'
diff --git a/test/old/testdir/test_mksession.vim b/test/old/testdir/test_mksession.vim
index 47465c46f9..8bb33bb023 100644
--- a/test/old/testdir/test_mksession.vim
+++ b/test/old/testdir/test_mksession.vim
@@ -398,6 +398,8 @@ endfunc
 if has('terminal')
 
 func Test_mksession_terminal_shell()
+  CheckFeature quickfix
+
   terminal
   mksession! Xtest_mks.out
   let lines = readfile('Xtest_mks.out')
@@ -479,8 +481,10 @@ func Test_mksession_terminal_no_ssop()
 endfunc
 
 func Test_mksession_terminal_restore_other()
+  CheckFeature quickfix
+
   terminal
-  call term_setrestore(bufnr('%'), 'other')
+  eval bufnr('%')->term_setrestore('other')
   mksession! Xtest_mks.out
   let lines = readfile('Xtest_mks.out')
   let term_cmd = ''
diff --git a/test/old/testdir/test_normal.vim b/test/old/testdir/test_normal.vim
index 09d3f0432f..f5ef2cc4ca 100644
--- a/test/old/testdir/test_normal.vim
+++ b/test/old/testdir/test_normal.vim
@@ -1923,6 +1923,8 @@ func Test_normal24_rot13()
 endfunc
 
 func Test_normal25_tag()
+  CheckFeature quickfix
+
   " Testing for CTRL-] g CTRL-] g]
   " CTRL-W g] CTRL-W CTRL-] CTRL-W g CTRL-]
   h
diff --git a/test/old/testdir/test_popup.vim b/test/old/testdir/test_popup.vim
index 0ff7d67c9f..fa0df77ab5 100644
--- a/test/old/testdir/test_popup.vim
+++ b/test/old/testdir/test_popup.vim
@@ -501,6 +501,8 @@ endfunc
 " Test that 'completefunc' on Scratch buffer with preview window works when
 " it's OK.
 func Test_completefunc_with_scratch_buffer()
+  CheckFeature quickfix
+
   new +setlocal\ buftype=nofile\ bufhidden=wipe\ noswapfile
   set completeopt+=preview
   setlocal completefunc=DummyCompleteFive
@@ -710,14 +712,13 @@ func Test_popup_and_window_resize()
 endfunc
 
 func Test_popup_and_preview_autocommand()
-  " This used to crash Vim
-  if !has('python')
-    return
-  endif
-  let h = winheight(0)
-  if h < 15
-    return
+  CheckFeature python
+  CheckFeature quickfix
+  if winheight(0) < 15
+    throw 'Skipped: window height insufficient'
   endif
+
+  " This used to crash Vim
   new
   augroup MyBufAdd
     au!
@@ -821,9 +822,8 @@ func Test_balloon_split()
 endfunc
 
 func Test_popup_position()
-  if !CanRunVimInTerminal()
-    return
-  endif
+  CheckScreendump
+
   let lines =<< trim END
     123456789_123456789_123456789_a
     123456789_123456789_123456789_b
diff --git a/test/old/testdir/test_tabpage.vim b/test/old/testdir/test_tabpage.vim
index 9d1d37b862..4e7b09b9e7 100644
--- a/test/old/testdir/test_tabpage.vim
+++ b/test/old/testdir/test_tabpage.vim
@@ -4,6 +4,8 @@ source screendump.vim
 source check.vim
 
 function Test_tabpage()
+  CheckFeature quickfix
+
   bw!
   " Simple test for opening and closing a tab page
   tabnew
@@ -273,6 +275,8 @@ function Test_tabpage_with_autocmd_tab_drop()
 endfunction
 
 function Test_tabpage_with_tab_modifier()
+  CheckFeature quickfix
+
   for n in range(4)
     tabedit
   endfor
diff --git a/test/old/testdir/test_window_cmd.vim b/test/old/testdir/test_window_cmd.vim
index bd4cb44b2b..152d1bacc7 100644
--- a/test/old/testdir/test_window_cmd.vim
+++ b/test/old/testdir/test_window_cmd.vim
@@ -508,6 +508,8 @@ func Test_equalalways_on_close()
 endfunc
 
 func Test_win_screenpos()
+  CheckFeature quickfix
+
   call assert_equal(1, winnr('$'))
   split
   vsplit