mirror of
https://github.com/vim/vim.git
synced 2025-09-25 03:54:15 -04:00
patch 8.2.1997: window changes when using bufload() while in a terminal popup
Problem: Window changes when using bufload() while in a terminal popup. Solution: When searching for a window by ID also find a popup window. (closes #7307)
This commit is contained in:
@@ -1237,6 +1237,23 @@ func Test_terminal_popup_with_cmd()
|
||||
unlet s:winid
|
||||
endfunc
|
||||
|
||||
func Test_terminal_popup_bufload()
|
||||
let termbuf = term_start(&shell, #{hidden: v:true, term_finish: 'close'})
|
||||
let winid = popup_create(termbuf, {})
|
||||
sleep 50m
|
||||
|
||||
let newbuf = bufadd('')
|
||||
call bufload(newbuf)
|
||||
call setbufline(newbuf, 1, 'foobar')
|
||||
|
||||
" must not have switched to another window
|
||||
call assert_equal(winid, win_getid())
|
||||
|
||||
call feedkeys("exit\<CR>", 'xt')
|
||||
sleep 50m
|
||||
exe 'bwipe! ' .. newbuf
|
||||
endfunc
|
||||
|
||||
func Test_terminal_popup_insert_cmd()
|
||||
CheckUnix
|
||||
|
||||
|
@@ -750,6 +750,8 @@ static char *(features[]) =
|
||||
|
||||
static int included_patches[] =
|
||||
{ /* Add new patch number below this line */
|
||||
/**/
|
||||
1997,
|
||||
/**/
|
||||
1996,
|
||||
/**/
|
||||
|
@@ -1462,6 +1462,7 @@ win_valid(win_T *win)
|
||||
|
||||
/*
|
||||
* Find window "id" in the current tab page.
|
||||
* Also find popup windows.
|
||||
* Return NULL if not found.
|
||||
*/
|
||||
win_T *
|
||||
@@ -1472,6 +1473,14 @@ win_find_by_id(int id)
|
||||
FOR_ALL_WINDOWS(wp)
|
||||
if (wp->w_id == id)
|
||||
return wp;
|
||||
#ifdef FEAT_PROP_POPUP
|
||||
FOR_ALL_POPUPWINS(wp)
|
||||
if (wp->w_id == id)
|
||||
return wp;
|
||||
FOR_ALL_POPUPWINS_IN_TAB(curtab, wp)
|
||||
if (wp->w_id == id)
|
||||
return wp;
|
||||
#endif
|
||||
return NULL;
|
||||
}
|
||||
|
||||
|
Reference in New Issue
Block a user