updated for version 7.2a-002

diff --git a/src/eval.c b/src/eval.c
index fada51d6460f314e27723d73b71d869f320fa682..67880cfb7db532d52dee19b7401b5d4fd9c18305 100644 (file)
--- a/src/eval.c
+++ b/src/eval.c
@@ -10442,17 +10442,12 @@ f_getbufvar(argvars, rettv)
 
     if (buf != NULL && varname != NULL)
     {
-       if (*varname == '&')    /* buffer-local-option */
-       {
-           /* set curbuf to be our buf, temporarily */
-           save_curbuf = curbuf;
-           curbuf = buf;
+       /* set curbuf to be our buf, temporarily */
+       save_curbuf = curbuf;
+       curbuf = buf;
 
+       if (*varname == '&')    /* buffer-local-option */
            get_option_tv(&varname, rettv, TRUE);
-
-           /* restore previous notion of curbuf */
-           curbuf = save_curbuf;
-       }
        else
        {
            if (*varname == NUL)
@@ -10461,10 +10456,13 @@ f_getbufvar(argvars, rettv)
                 * find_var_in_ht(). */
                varname = (char_u *)"b:" + 2;
            /* look up the variable */
-           v = find_var_in_ht(&buf->b_vars.dv_hashtab, varname, FALSE);
+           v = find_var_in_ht(&curbuf->b_vars.dv_hashtab, varname, FALSE);
            if (v != NULL)
                copy_tv(&v->di_tv, rettv);
        }
+
+       /* restore previous notion of curbuf */
+       curbuf = save_curbuf;
     }
 
     --emsg_off;

diff --git a/src/version.c b/src/version.c
index c8565c447a9f2989015e6f0fdeb5b2cb4720f744..6730cc0fd778e7e6f0cb2d6e7fad9fae8bb4c876 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -676,6 +676,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    2,
 /**/
     1,
 /**/