mirrors/neovim
1
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2025-09-22 11:18:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

vim-patch:9.0.0066: switching window uneccarily when getting buffer options

Browse Source 
Problem:    Switching window uneccarily when getting buffer options.
Solution:   Do not switch window when getting buffer options. (closes vim/vim#10767)
cd6ad6439d
This commit is contained in:
zeertzjq
2022-07-25 19:31:55 +08:00
parent 56ed5a0403
commit ad57610ac7
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/nvim/eval/vars.c
View File

@@ -1506,6 +1506,7 @@ static void get_var_from(const char *varname, typval_T *rettv, typval_T *deftv,
tabpage_T *tp, win_T *win, buf_T *buf) tabpage_T *tp, win_T *win, buf_T *buf)
{ {
bool done = false; bool done = false;
const bool do_change_curbuf = buf != NULL && htname == 'b';
emsg_off++; emsg_off++;
@@ -1518,19 +1519,19 @@ static void get_var_from(const char *varname, typval_T *rettv, typval_T *deftv,
// autocommands get blocked. // autocommands get blocked.
// If we have a buffer reference avoid the switching, we're saving and // If we have a buffer reference avoid the switching, we're saving and
// restoring curbuf directly. // restoring curbuf directly.
const bool need_switch_win = !(tp == curtab && win == curwin) || (buf != NULL); const bool need_switch_win = !(tp == curtab && win == curwin) && !do_change_curbuf;
switchwin_T switchwin; switchwin_T switchwin;
if (!need_switch_win || switch_win(&switchwin, win, tp, true) == OK) { if (!need_switch_win || switch_win(&switchwin, win, tp, true) == OK) {
if (*varname == '&' && htname != 't') { if (*varname == '&' && htname != 't') {
buf_T *const save_curbuf = curbuf; buf_T *const save_curbuf = curbuf;
// Change curbuf so the option is read from the correct buffer. // Change curbuf so the option is read from the correct buffer.
if (buf != NULL && htname == 'b') { if (do_change_curbuf) {
curbuf = buf; curbuf = buf;
} }
if (varname[1] == NUL) { if (varname[1] == NUL) {
// get all window-local options in a dict // get all window-local or buffer-local options in a dict
dict_T *opts = get_winbuf_options(htname == 'b'); dict_T *opts = get_winbuf_options(htname == 'b');
if (opts != NULL) { if (opts != NULL) {