patch 8.1.2373: cannot build with +popupwin but without +quickfix
Problem: Cannot build with +popupwin but without +quickfix. (John Marriott)
Solution: Adjust #ifdefs.
diff --git a/src/testdir/test_popup.vim b/src/testdir/test_popup.vim
index 21bd22a..5922efa 100644
--- a/src/testdir/test_popup.vim
+++ b/src/testdir/test_popup.vim
@@ -490,6 +490,8 @@
" 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
@@ -665,6 +667,7 @@
func Test_popup_and_window_resize()
CheckFeature terminal
+ CheckFeature quickfix
CheckNotGui
let h = winheight(0)
@@ -697,14 +700,13 @@
endfunc
func Test_popup_and_preview_autocommand()
+ CheckFeature python
+ CheckFeature quickfix
+ if winheight(0) < 15
+ throw 'Skipped: window height insufficient'
+ endif
+
" This used to crash Vim
- if !has('python')
- return
- endif
- let h = winheight(0)
- if h < 15
- return
- endif
new
augroup MyBufAdd
au!
@@ -735,9 +737,9 @@
endfunc
func Test_popup_and_previewwindow_dump()
- if !CanRunVimInTerminal()
- throw 'Skipped: cannot make screendumps'
- endif
+ CheckScreendump
+ CheckFeature quickfix
+
let lines =<< trim END
set previewheight=9
silent! pedit
@@ -804,9 +806,8 @@
endfunc
func Test_popup_position()
- if !CanRunVimInTerminal()
- throw 'Skipped: cannot make screendumps'
- endif
+ CheckScreendump
+
let lines =<< trim END
123456789_123456789_123456789_a
123456789_123456789_123456789_b
@@ -847,9 +848,8 @@
endfunc
func Test_popup_command()
- if !CanRunVimInTerminal() || !has('menu')
- throw 'Skipped: cannot make screendumps and/or menu feature missing'
- endif
+ CheckScreendump
+ CheckFeature menu
let lines =<< trim END
one two three four five