mirrors/neovim
1
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2025-09-14 23:38:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge #5257 from jbradaric/vim-7.4.1893

Browse Source 
vim-patch:7.4.{1893,1895}
This commit is contained in:
Justin M. Keyes
2016-10-13 01:19:09 +02:00
committed by GitHub
parent 22fe76aec4 1b61bd93ae
commit 5a61ff188c
8 changed files with 94 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

48
src/nvim/eval.c
View File

@@ -6709,7 +6709,6 @@ static int get_env_tv(char_u **arg, typval_T *rettv, int evaluate)
# include "funcs.generated.h"
#endif
/*
* Function given to ExpandGeneric() to obtain the list of internal
* or user defined function names.
@@ -7712,26 +7711,47 @@ static void f_bufnr(typval_T *argvars, typval_T *rettv, FunPtr fptr)
rettv->vval.v_number = -1;
}
/*
* "bufwinnr(nr)" function
*/
static void f_bufwinnr(typval_T *argvars, typval_T *rettv, FunPtr fptr)
static void buf_win_common(typval_T *argvars, typval_T *rettv, bool get_nr)
{
(void)get_tv_number(&argvars[0]); /* issue errmsg if type error */
++emsg_off;
int error = false;
(void)get_tv_number_chk(&argvars[0], &error); // issue errmsg if type error
if (error) { // the argument has an invalid type
rettv->vval.v_number = -1;
return;
}
emsg_off++;
buf_T *buf = get_buf_tv(&argvars[0], true);
if (buf == NULL) { // no need to search if buffer was not found
rettv->vval.v_number = -1;
goto end;
}
buf_T *buf = get_buf_tv(&argvars[0], TRUE);
int winnr = 0;
int winid;
bool found_buf = false;
FOR_ALL_WINDOWS_IN_TAB(wp, curtab) {
++winnr;
winnr++;
if (wp->w_buffer == buf) {
found_buf = true;
winid = wp->handle;
break;
}
}
rettv->vval.v_number = (found_buf ? winnr : -1);
--emsg_off;
rettv->vval.v_number = (found_buf ? (get_nr ? winnr : winid) : -1);
end:
emsg_off--;
}
/// "bufwinid(nr)" function
static void f_bufwinid(typval_T *argvars, typval_T *rettv, FunPtr fptr) {
buf_win_common(argvars, rettv, false);
}
/// "bufwinnr(nr)" function
static void f_bufwinnr(typval_T *argvars, typval_T *rettv, FunPtr fptr)
{
buf_win_common(argvars, rettv, true);
}
/*
@@ -10279,7 +10299,11 @@ find_win_by_nr (
}
FOR_ALL_WINDOWS_IN_TAB(wp, tp) {
if (--nr <= 0) {
if (nr >= LOWEST_WIN_ID) {
if (wp->handle == nr) {
return wp;
}
} else if (--nr <= 0) {
return wp;
}
}