Permalink
Browse files

patch 8.0.1190: unusable after opening new window in BufWritePre event

Problem:    Vim becomes unusable after opening new window in BufWritePre
            event.
Solution:   Call not_exiting(). (Martin Tournoij, closes #2205)
            Also for "2q" when a help window is open.  Add a test.
  • Loading branch information...
brammool committed Oct 14, 2017
1 parent 6047e2c commit 2c33d7bb69c4c2c5b0e39b03cc4b0c04cfdfbb0b
Showing with 48 additions and 0 deletions.
  1. +2 −0 src/ex_docmd.c
  2. +44 −0 src/testdir/test_writefile.vim
  3. +2 −0 src/version.c
View
@@ -7261,6 +7261,7 @@ ex_quit(exarg_T *eap)
*/
if (only_one_window() && (ONE_WINDOW || eap->addr_count == 0))
getout(0);
not_exiting();
#ifdef FEAT_GUI
need_mouse_correct = TRUE;
#endif
@@ -7799,6 +7800,7 @@ ex_exit(exarg_T *eap)
{
if (only_one_window()) /* quit last window, exit Vim */
getout(0);
not_exiting();
# ifdef FEAT_GUI
need_mouse_correct = TRUE;
# endif
@@ -49,3 +49,47 @@ func Test_writefile_fails_conversion()
bwipe!
set backup& writebackup&
endfunc
func SetFlag(timer)
let g:flag = 1
endfunc
func Test_write_quit_split()
" Prevent exiting by splitting window on file write.
augroup testgroup
autocmd BufWritePre * split
augroup END
e! Xfile
call setline(1, 'nothing')
wq
if has('timers')
" timer will not run if "exiting" is still set
let g:flag = 0
call timer_start(1, 'SetFlag')
sleep 50m
call assert_equal(1, g:flag)
unlet g:flag
endif
au! testgroup
bwipe Xfile
call delete('Xfile')
endfunc
func Test_nowrite_quit_split()
" Prevent exiting by opening a help window.
e! Xfile
help
wincmd w
exe winnr() . 'q'
if has('timers')
" timer will not run if "exiting" is still set
let g:flag = 0
call timer_start(1, 'SetFlag')
sleep 50m
call assert_equal(1, g:flag)
unlet g:flag
endif
bwipe Xfile
endfunc
View
@@ -761,6 +761,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
1190,
/**/
1189,
/**/

0 comments on commit 2c33d7b

Please sign in to comment.