projects / packages / vim.git / blame
| Commit | Line | Data |
|---|---|---|
| f3c378e8 AG |
1 | To: vim-dev@vim.org |
| 2 | Subject: Patch 7.0.124 | |
| 3 | Fcc: outbox | |
| 4 | From: Bram Moolenaar <Bram@moolenaar.net> | |
| 5 | Mime-Version: 1.0 | |
| 6 | Content-Type: text/plain; charset=ISO-8859-1 | |
| 7 | Content-Transfer-Encoding: 8bit | |
| 8 | ------------ | |
| 9 | ||
| 10 | Patch 7.0.124 | |
| 11 | Problem: getwinvar() obtains a dictionary with window-local variables, but | |
| 12 | it's always for the current window. | |
| 13 | Solution: Get the variables of the specified window. (Geoff Reedy) | |
| 14 | Files: src/eval.c | |
| 15 | ||
| 16 | ||
| 17 | *** ../vim-7.0.123/src/eval.c Tue Oct 3 14:43:31 2006 | |
| 18 | --- src/eval.c Fri Oct 6 21:08:57 2006 | |
| 19 | *************** | |
| 20 | *** 10432,10451 **** | |
| 21 | ||
| 22 | if (win != NULL && varname != NULL) | |
| 23 | { | |
| 24 | ! if (*varname == '&') /* window-local-option */ | |
| 25 | ! { | |
| 26 | ! /* Set curwin to be our win, temporarily. Also set curbuf, so | |
| 27 | ! * that we can get buffer-local options. */ | |
| 28 | ! oldcurwin = curwin; | |
| 29 | ! curwin = win; | |
| 30 | ! curbuf = win->w_buffer; | |
| 31 | ||
| 32 | get_option_tv(&varname, rettv, 1); | |
| 33 | - | |
| 34 | - /* restore previous notion of curwin */ | |
| 35 | - curwin = oldcurwin; | |
| 36 | - curbuf = curwin->w_buffer; | |
| 37 | - } | |
| 38 | else | |
| 39 | { | |
| 40 | if (*varname == NUL) | |
| 41 | --- 10432,10445 ---- | |
| 42 | ||
| 43 | if (win != NULL && varname != NULL) | |
| 44 | { | |
| 45 | ! /* Set curwin to be our win, temporarily. Also set curbuf, so | |
| 46 | ! * that we can get buffer-local options. */ | |
| 47 | ! oldcurwin = curwin; | |
| 48 | ! curwin = win; | |
| 49 | ! curbuf = win->w_buffer; | |
| 50 | ||
| 51 | + if (*varname == '&') /* window-local-option */ | |
| 52 | get_option_tv(&varname, rettv, 1); | |
| 53 | else | |
| 54 | { | |
| 55 | if (*varname == NUL) | |
| 56 | *************** | |
| 57 | *** 10458,10463 **** | |
| 58 | --- 10452,10461 ---- | |
| 59 | if (v != NULL) | |
| 60 | copy_tv(&v->di_tv, rettv); | |
| 61 | } | |
| 62 | + | |
| 63 | + /* restore previous notion of curwin */ | |
| 64 | + curwin = oldcurwin; | |
| 65 | + curbuf = curwin->w_buffer; | |
| 66 | } | |
| 67 | ||
| 68 | --emsg_off; | |
| 69 | *** ../vim-7.0.123/src/version.c Tue Oct 10 11:41:44 2006 | |
| 70 | --- src/version.c Tue Oct 10 12:53:15 2006 | |
| 71 | *************** | |
| 72 | *** 668,669 **** | |
| 73 | --- 668,671 ---- | |
| 74 | { /* Add new patch number below this line */ | |
| 75 | + /**/ | |
| 76 | + 124, | |
| 77 | /**/ | |
| 78 | ||
| 79 | -- | |
| 80 | How To Keep A Healthy Level Of Insanity: | |
| 81 | 14. Put mosquito netting around your work area. Play a tape of jungle | |
| 82 | sounds all day. | |
| 83 | ||
| 84 | /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\ | |
| 85 | /// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\ | |
| 86 | \\\ download, build and distribute -- http://www.A-A-P.org /// | |
| 87 | \\\ help me help AIDS victims -- http://ICCF-Holland.org /// |