updated for version 7.0-124

src/eval.c

@@ -10431,8 +10431,6 @@ getwinvar(argvars, rettv, off)
     rettv->vval.v_string = NULL;
 
     if (win != NULL && varname != NULL)
-    {
-	if (*varname == '&')	/* window-local-option */
     {
 	/* Set curwin to be our win, temporarily.  Also set curbuf, so
 	 * that we can get buffer-local options. */
@@ -10440,12 +10438,8 @@ getwinvar(argvars, rettv, off)
 	curwin = win;
 	curbuf = win->w_buffer;
 
+	if (*varname == '&')	/* window-local-option */
 	    get_option_tv(&varname, rettv, 1);
-
-	    /* restore previous notion of curwin */
-	    curwin = oldcurwin;
-	    curbuf = curwin->w_buffer;
-	}
 	else
 	{
 	    if (*varname == NUL)
@@ -10458,6 +10452,10 @@ getwinvar(argvars, rettv, off)
 	    if (v != NULL)
 		copy_tv(&v->di_tv, rettv);
 	}
+
+	/* restore previous notion of curwin */
+	curwin = oldcurwin;
+	curbuf = curwin->w_buffer;
     }
 
     --emsg_off;

src/version.c

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