aniani/vim
0
0
Fork 1
mirror of https://github.com/vim/vim.git synced 2025-09-24 03:44:06 -04:00
Code Activity

patch 7.4.1893

Browse Source 
Problem:    Cannot easily get the window ID for a buffer.
Solution:   Add bufwinid().
This commit is contained in:
Bram Moolenaar
2016-06-04 17:58:52 +02:00
parent c9721bdc63
commit b3619a90ea
3 changed files with 37 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
src/eval.c
View File

@@ -500,6 +500,7 @@ static void f_buflisted(typval_T *argvars, typval_T *rettv);
static void f_bufloaded(typval_T *argvars, typval_T *rettv);
static void f_bufname(typval_T *argvars, typval_T *rettv);
static void f_bufnr(typval_T *argvars, typval_T *rettv);
static void f_bufwinid(typval_T *argvars, typval_T *rettv);
static void f_bufwinnr(typval_T *argvars, typval_T *rettv);
static void f_byte2line(typval_T *argvars, typval_T *rettv);
static void byteidx(typval_T *argvars, typval_T *rettv, int comp);
@@ -8488,6 +8489,7 @@ static struct fst
{"bufloaded", 1, 1, f_bufloaded},
{"bufname", 1, 1, f_bufname},
{"bufnr", 1, 2, f_bufnr},
{"bufwinid", 1, 1, f_bufwinid},
{"bufwinnr", 1, 1, f_bufwinnr},
{"byte2line", 1, 1, f_byte2line},
{"byteidx", 2, 2, f_byteidx},
@@ -10213,11 +10215,8 @@ f_bufnr(typval_T *argvars, typval_T *rettv)
rettv->vval.v_number = -1;
}
/*
* "bufwinnr(nr)" function
*/
static void
f_bufwinnr(typval_T *argvars, typval_T *rettv)
buf_win_common(typval_T *argvars, typval_T *rettv, int get_nr)
{
#ifdef FEAT_WINDOWS
win_T *wp;
@@ -10235,13 +10234,32 @@ f_bufwinnr(typval_T *argvars, typval_T *rettv)
if (wp->w_buffer == buf)
break;
}
rettv->vval.v_number = (wp != NULL ? winnr : -1);
rettv->vval.v_number = (wp != NULL ? (get_nr ? winnr : wp->w_id) : -1);
#else
rettv->vval.v_number = (curwin->w_buffer == buf ? 1 : -1);
rettv->vval.v_number = (curwin->w_buffer == buf
? (get_nr ? 1 : curwin->w_id) : -1);
#endif
--emsg_off;
}
/*
* "bufwinid(nr)" function
*/
static void
f_bufwinid(typval_T *argvars, typval_T *rettv)
{
buf_win_common(argvars, rettv, FALSE);
}
/*
* "bufwinnr(nr)" function
*/
static void
f_bufwinnr(typval_T *argvars, typval_T *rettv)
{
buf_win_common(argvars, rettv, TRUE);
}
/*
* "byte2line(byte)" function
*/