| Révision | 8f1e16995118a8b68bc63c790072e2e86ff28257 (tree) |
|---|---|
| l'heure | 2022-07-25 20:30:05 |
| Auteur | Bram Moolenaar <Bram@vim....> |
| Commiter | Bram Moolenaar |
patch 9.0.0066: switching window uneccarily when getting buffer options
Commit: https://github.com/vim/vim/commit/cd6ad6439da2ee2d1a8a6934c9d69e9c2664ba55
Author: zeertzjq <zeertzjq@outlook.com>
Date: Mon Jul 25 12:28:09 2022 +0100
src/evalvars.c (diff) src/version.c (diff)| @@ -4098,6 +4098,7 @@ | ||
| 4098 | 4098 | int done = FALSE; |
| 4099 | 4099 | switchwin_T switchwin; |
| 4100 | 4100 | int need_switch_win; |
| 4101 | + int do_change_curbuf = buf != NULL && htname == 'b'; | |
| 4101 | 4102 | |
| 4102 | 4103 | ++emsg_off; |
| 4103 | 4104 |
| @@ -4112,7 +4113,7 @@ | ||
| 4112 | 4113 | // autocommands get blocked. |
| 4113 | 4114 | // If we have a buffer reference avoid the switching, we're saving and |
| 4114 | 4115 | // restoring curbuf directly. |
| 4115 | - need_switch_win = !(tp == curtab && win == curwin) || (buf != NULL); | |
| 4116 | + need_switch_win = !(tp == curtab && win == curwin) && !do_change_curbuf; | |
| 4116 | 4117 | if (!need_switch_win || switch_win(&switchwin, win, tp, TRUE) == OK) |
| 4117 | 4118 | { |
| 4118 | 4119 | // Handle options. There are no tab-local options. |
| @@ -4121,12 +4122,12 @@ | ||
| 4121 | 4122 | buf_T *save_curbuf = curbuf; |
| 4122 | 4123 | |
| 4123 | 4124 | // Change curbuf so the option is read from the correct buffer. |
| 4124 | - if (buf != NULL && htname == 'b') | |
| 4125 | + if (do_change_curbuf) | |
| 4125 | 4126 | curbuf = buf; |
| 4126 | 4127 | |
| 4127 | 4128 | if (varname[1] == NUL) |
| 4128 | 4129 | { |
| 4129 | - // get all window-local options in a dict | |
| 4130 | + // get all window-local or buffer-local options in a dict | |
| 4130 | 4131 | dict_T *opts = get_winbuf_options(htname == 'b'); |
| 4131 | 4132 | |
| 4132 | 4133 | if (opts != NULL) |
| @@ -736,6 +736,8 @@ | ||
| 736 | 736 | static int included_patches[] = |
| 737 | 737 | { /* Add new patch number below this line */ |
| 738 | 738 | /**/ |
| 739 | + 66, | |
| 740 | +/**/ | |
| 739 | 741 | 65, |
| 740 | 742 | /**/ |
| 741 | 743 | 64, |
Vim
Fork