From 69a7e430289835c443ba963b25e385ca1519745e Mon Sep 17 00:00:00 2001 From: Bram Moolenaar Date: Tue, 10 Oct 2006 10:55:47 +0000 Subject: updated for version 7.0-124 --- src/eval.c | 22 ++++++++++------------ 1 file changed, 10 insertions(+), 12 deletions(-) (limited to 'src/eval.c') diff --git a/src/eval.c b/src/eval.c index d32efaa7b..13c0bd618 100644 --- 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; -- cgit v1.2.1