aniani/vim
0
0
Fork 1
mirror of https://github.com/vim/vim.git synced 2025-09-26 04:04:07 -04:00
Code Activity

patch 7.4.888

Browse Source 
Problem:    The OptionSet autocommands are not triggered from setwinvar().
Solution:   Do not use switch_win() when not needed. (Hirohito Higashi)
This commit is contained in:
Bram Moolenaar
2015-09-29 16:53:22 +02:00
parent c2b717ebd6
commit ba117c23df
2 changed files with 26 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
src/eval.c
View File

@@ -12420,12 +12420,16 @@ getwinvar(argvars, rettv, off)
typval_T *rettv; typval_T *rettv;
int off; /* 1 for gettabwinvar() */ int off; /* 1 for gettabwinvar() */
{ {
win_T *win, *oldcurwin; win_T *win;
char_u *varname; char_u *varname;
dictitem_T *v; dictitem_T *v;
tabpage_T *tp = NULL; tabpage_T *tp = NULL;
tabpage_T *oldtabpage;
int done = FALSE; int done = FALSE;
#ifdef FEAT_WINDOWS
win_T *oldcurwin;
tabpage_T *oldtabpage;
int need_switch_win;
#endif
#ifdef FEAT_WINDOWS #ifdef FEAT_WINDOWS
if (off == 1) if (off == 1)
@@ -12442,9 +12446,14 @@ getwinvar(argvars, rettv, off)
if (win != NULL && varname != NULL) if (win != NULL && varname != NULL)
{ {
#ifdef FEAT_WINDOWS
/* Set curwin to be our win, temporarily. Also set the tabpage, /* Set curwin to be our win, temporarily. Also set the tabpage,
* otherwise the window is not valid. */ * otherwise the window is not valid. Only do this when needed,
if (switch_win(&oldcurwin, &oldtabpage, win, tp, TRUE) == OK) * autocommands get blocked. */
need_switch_win = !(tp == curtab && win == curwin);
if (!need_switch_win
|| switch_win(&oldcurwin, &oldtabpage, win, tp, TRUE) == OK)
#endif
{ {
if (*varname == '&') /* window-local-option */ if (*varname == '&') /* window-local-option */
{ {
@@ -12465,8 +12474,11 @@ getwinvar(argvars, rettv, off)
} }
} }
#ifdef FEAT_WINDOWS
if (need_switch_win)
/* restore previous notion of curwin */ /* restore previous notion of curwin */
restore_win(oldcurwin, oldtabpage, TRUE); restore_win(oldcurwin, oldtabpage, TRUE);
#endif
} }
if (!done && argvars[off + 2].v_type != VAR_UNKNOWN) if (!done && argvars[off + 2].v_type != VAR_UNKNOWN)
@@ -17597,6 +17609,7 @@ setwinvar(argvars, rettv, off)
#ifdef FEAT_WINDOWS #ifdef FEAT_WINDOWS
win_T *save_curwin; win_T *save_curwin;
tabpage_T *save_curtab; tabpage_T *save_curtab;
int need_switch_win;
#endif #endif
char_u *varname, *winvarname; char_u *varname, *winvarname;
typval_T *varp; typval_T *varp;
@@ -17619,7 +17632,9 @@ setwinvar(argvars, rettv, off)
if (win != NULL && varname != NULL && varp != NULL) if (win != NULL && varname != NULL && varp != NULL)
{ {
#ifdef FEAT_WINDOWS #ifdef FEAT_WINDOWS
if (switch_win(&save_curwin, &save_curtab, win, tp, TRUE) == OK) need_switch_win = !(tp == curtab && win == curwin);
if (!need_switch_win
|| switch_win(&save_curwin, &save_curtab, win, tp, TRUE) == OK)
#endif #endif
{ {
if (*varname == '&') if (*varname == '&')
@@ -17647,6 +17662,7 @@ setwinvar(argvars, rettv, off)
} }
} }
#ifdef FEAT_WINDOWS #ifdef FEAT_WINDOWS
if (need_switch_win)
restore_win(save_curwin, save_curtab, TRUE); restore_win(save_curwin, save_curtab, TRUE);
#endif #endif
} }

2
src/version.c
View File

@@ -741,6 +741,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 */
/**/
888,
/**/ /**/
887, 887,
/**/ /**/