thac0/vim
1
0
Fork 0
forked from aniani/vim
Code Activity

patch 8.1.0494: functions do not check for a window ID in other tabs

Browse Source 
Problem:    Functions do not check for a window ID in other tabs.
Solution:   Also find the window ID in other than the current tab.
This commit is contained in:
Bram Moolenaar
2018-10-25 13:11:16 +02:00
parent e6e3989c1b
commit babfcf54ae
2 changed files with 9 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/evalfunc.c
View File

@@ -5291,7 +5291,7 @@ f_getloclist(typval_T *argvars UNUSED, typval_T *rettv UNUSED)
#ifdef FEAT_QUICKFIX #ifdef FEAT_QUICKFIX
win_T *wp; win_T *wp;
wp = find_win_by_nr(&argvars[0], NULL); wp = find_win_by_nr_or_id(&argvars[0]);
get_qf_loc_list(FALSE, wp, &argvars[1], rettv); get_qf_loc_list(FALSE, wp, &argvars[1], rettv);
#endif #endif
} }
@@ -5796,7 +5796,7 @@ f_win_screenpos(typval_T *argvars, typval_T *rettv)
if (rettv_list_alloc(rettv) == FAIL) if (rettv_list_alloc(rettv) == FAIL)
return; return;
wp = find_win_by_nr(&argvars[0], NULL); wp = find_win_by_nr_or_id(&argvars[0]);
list_append_number(rettv->vval.v_list, wp == NULL ? 0 : wp->w_winrow + 1); list_append_number(rettv->vval.v_list, wp == NULL ? 0 : wp->w_winrow + 1);
list_append_number(rettv->vval.v_list, wp == NULL ? 0 : wp->w_wincol + 1); list_append_number(rettv->vval.v_list, wp == NULL ? 0 : wp->w_wincol + 1);
} }
@@ -8028,7 +8028,7 @@ matchadd_dict_arg(typval_T *tv, char_u **conceal_char, win_T **win)
if ((di = dict_find(tv->vval.v_dict, (char_u *)"window", -1)) != NULL) if ((di = dict_find(tv->vval.v_dict, (char_u *)"window", -1)) != NULL)
{ {
*win = find_win_by_nr(&di->di_tv, NULL); *win = find_win_by_nr_or_id(&di->di_tv);
if (*win == NULL) if (*win == NULL)
{ {
EMSG(_("E957: Invalid window number")); EMSG(_("E957: Invalid window number"));
@@ -10785,7 +10785,7 @@ f_setloclist(typval_T *argvars, typval_T *rettv)
rettv->vval.v_number = -1; rettv->vval.v_number = -1;
win = find_win_by_nr(&argvars[0], NULL); win = find_win_by_nr_or_id(&argvars[0]);
if (win != NULL) if (win != NULL)
set_qf_ll_list(win, &argvars[1], &argvars[2], &argvars[3], rettv); set_qf_ll_list(win, &argvars[1], &argvars[2], &argvars[3], rettv);
} }
@@ -13843,7 +13843,7 @@ f_winbufnr(typval_T *argvars, typval_T *rettv)
{ {
win_T *wp; win_T *wp;
wp = find_win_by_nr(&argvars[0], NULL); wp = find_win_by_nr_or_id(&argvars[0]);
if (wp == NULL) if (wp == NULL)
rettv->vval.v_number = -1; rettv->vval.v_number = -1;
else else
@@ -13868,7 +13868,7 @@ f_winheight(typval_T *argvars, typval_T *rettv)
{ {
win_T *wp; win_T *wp;
wp = find_win_by_nr(&argvars[0], NULL); wp = find_win_by_nr_or_id(&argvars[0]);
if (wp == NULL) if (wp == NULL)
rettv->vval.v_number = -1; rettv->vval.v_number = -1;
else else
@@ -14035,7 +14035,7 @@ f_winwidth(typval_T *argvars, typval_T *rettv)
{ {
win_T *wp; win_T *wp;
wp = find_win_by_nr(&argvars[0], NULL); wp = find_win_by_nr_or_id(&argvars[0]);
if (wp == NULL) if (wp == NULL)
rettv->vval.v_number = -1; rettv->vval.v_number = -1;
else else

2
src/version.c
View File

@@ -792,6 +792,8 @@ static char *(features[]) =
static int included_patches[] = static int included_patches[] =
{ /* Add new patch number below this line */ { /* Add new patch number below this line */
/**/
494,
/**/ /**/
493, 493,
/**/ /**/