updated for version 7.0-124

diff --git a/src/eval.c b/src/eval.c
index d32efaa7b66aef51e57774702f74f38cef85798b..13c0bd618c5ec375d6d03b91125752553be9ae62 100644 (file)
--- a/src/eval.c
+++ b/src/eval.c
@@ -10432,20 +10432,14 @@ getwinvar(argvars, rettv, off)
 
     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. */
-           oldcurwin = curwin;
-           curwin = win;
-           curbuf = win->w_buffer;
+       /* Set curwin to be our win, temporarily.  Also set curbuf, so
+        * that we can get buffer-local options. */
+       oldcurwin = curwin;
+       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;

diff --git a/src/version.c b/src/version.c
index 5ebaecc1894408e25fb7e524a147323311b35034..f148a358eb80b76dffe1f154e7793f29d938bd99 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -666,6 +666,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    124,
 /**/
     123,
 /**/