diff options
| author | zeertzjq <zeertzjq@outlook.com> | 2024-07-17 19:25:38 +0200 |
|---|---|---|
| committer | Christian Brabandt <cb@256bit.org> | 2024-07-17 19:26:50 +0200 |
| commit | ac4ce9e15b7ee0fccfa72aecf98b696d880e53c3 (patch) | |
| tree | 648516a6ff45ccafa583726821f00fd779247622 | |
| parent | d24aaa9983619264cb5b4178924a352bb3a0eb37 (diff) | |
patch 9.1.0594: Unnecessary redraw when setting 'winfixbuf'v9.1.0594
Problem: Unnecessary redraw when setting 'winfixbuf'.
Solution: Remove P_RWIN flag. (zeertzjq)
closes: #15283
Signed-off-by: zeertzjq <zeertzjq@outlook.com>
Signed-off-by: Christian Brabandt <cb@256bit.org>
| -rw-r--r-- | src/optiondefs.h | 6 | ||||
| -rw-r--r-- | src/testdir/test_goto.vim | 5 | ||||
| -rw-r--r-- | src/version.c | 2 |
3 files changed, 8 insertions, 5 deletions
diff --git a/src/optiondefs.h b/src/optiondefs.h index bf3ed35e0b..b5446193d5 100644 --- a/src/optiondefs.h +++ b/src/optiondefs.h @@ -2855,13 +2855,13 @@ static struct vimoption options[] = {"window", "wi", P_NUM|P_VI_DEF, (char_u *)&p_window, PV_NONE, did_set_window, NULL, {(char_u *)0L, (char_u *)0L} SCTX_INIT}, - {"winfixbuf", "wfb", P_BOOL|P_VI_DEF|P_RWIN, + {"winfixbuf", "wfb", P_BOOL|P_VI_DEF, (char_u *)VAR_WIN, PV_WFB, NULL, NULL, {(char_u *)FALSE, (char_u *)0L} SCTX_INIT}, {"winfixheight", "wfh", P_BOOL|P_VI_DEF|P_RSTAT, (char_u *)VAR_WIN, PV_WFH, NULL, NULL, {(char_u *)FALSE, (char_u *)0L} SCTX_INIT}, - {"winfixwidth", "wfw", P_BOOL|P_VI_DEF|P_RSTAT, + {"winfixwidth", "wfw", P_BOOL|P_VI_DEF|P_RSTAT, (char_u *)VAR_WIN, PV_WFW, NULL, NULL, {(char_u *)FALSE, (char_u *)0L} SCTX_INIT}, {"winheight", "wh", P_NUM|P_VI_DEF, @@ -2871,7 +2871,7 @@ static struct vimoption options[] = {"winminheight", "wmh", P_NUM|P_VI_DEF, (char_u *)&p_wmh, PV_NONE, did_set_winminheight, NULL, {(char_u *)1L, (char_u *)0L} SCTX_INIT}, - {"winminwidth", "wmw", P_NUM|P_VI_DEF, + {"winminwidth", "wmw", P_NUM|P_VI_DEF, (char_u *)&p_wmw, PV_NONE, did_set_winminwidth, NULL, {(char_u *)1L, (char_u *)0L} SCTX_INIT}, {"winptydll", NULL, P_STRING|P_EXPAND|P_VI_DEF|P_SECURE, diff --git a/src/testdir/test_goto.vim b/src/testdir/test_goto.vim index 357a8d27c8..8813bcbacd 100644 --- a/src/testdir/test_goto.vim +++ b/src/testdir/test_goto.vim @@ -296,6 +296,7 @@ func Test_gd_string() return x; } [CODE] + call XTest_goto_decl('gd', lines, 4, 7) endfunc @@ -320,14 +321,14 @@ func Test_set_options_keep_col() let pos = getcurpos() normal j set invhlsearch spell spelllang=en,cjk spelloptions=camel textwidth=80 - set cursorline cursorcolumn cursorlineopt=line colorcolumn=+1 + set cursorline cursorcolumn cursorlineopt=line colorcolumn=+1 winfixbuf set background=dark set background=light normal k call assert_equal(pos, getcurpos()) bwipe! set hlsearch& spell& spelllang& spelloptions& textwidth& - set cursorline& cursorcolumn& cursorlineopt& colorcolumn& + set cursorline& cursorcolumn& cursorlineopt& colorcolumn& winfixbuf& set background& endfunc diff --git a/src/version.c b/src/version.c index 49aeb92f7a..986edc9286 100644 --- a/src/version.c +++ b/src/version.c @@ -705,6 +705,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 594, +/**/ 593, /**/ 592, |