Skip to content

Commit ac4ce9e

Browse files
zeertzjqchrisbra
authored andcommitted
patch 9.1.0594: Unnecessary redraw when setting 'winfixbuf'
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>
1 parent d24aaa9 commit ac4ce9e

3 files changed

Lines changed: 8 additions & 5 deletions

File tree

src/optiondefs.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2855,13 +2855,13 @@ static struct vimoption options[] =
28552855
{"window", "wi", P_NUM|P_VI_DEF,
28562856
(char_u *)&p_window, PV_NONE, did_set_window, NULL,
28572857
{(char_u *)0L, (char_u *)0L} SCTX_INIT},
2858-
{"winfixbuf", "wfb", P_BOOL|P_VI_DEF|P_RWIN,
2858+
{"winfixbuf", "wfb", P_BOOL|P_VI_DEF,
28592859
(char_u *)VAR_WIN, PV_WFB, NULL, NULL,
28602860
{(char_u *)FALSE, (char_u *)0L} SCTX_INIT},
28612861
{"winfixheight", "wfh", P_BOOL|P_VI_DEF|P_RSTAT,
28622862
(char_u *)VAR_WIN, PV_WFH, NULL, NULL,
28632863
{(char_u *)FALSE, (char_u *)0L} SCTX_INIT},
2864-
{"winfixwidth", "wfw", P_BOOL|P_VI_DEF|P_RSTAT,
2864+
{"winfixwidth", "wfw", P_BOOL|P_VI_DEF|P_RSTAT,
28652865
(char_u *)VAR_WIN, PV_WFW, NULL, NULL,
28662866
{(char_u *)FALSE, (char_u *)0L} SCTX_INIT},
28672867
{"winheight", "wh", P_NUM|P_VI_DEF,
@@ -2871,7 +2871,7 @@ static struct vimoption options[] =
28712871
{"winminheight", "wmh", P_NUM|P_VI_DEF,
28722872
(char_u *)&p_wmh, PV_NONE, did_set_winminheight, NULL,
28732873
{(char_u *)1L, (char_u *)0L} SCTX_INIT},
2874-
{"winminwidth", "wmw", P_NUM|P_VI_DEF,
2874+
{"winminwidth", "wmw", P_NUM|P_VI_DEF,
28752875
(char_u *)&p_wmw, PV_NONE, did_set_winminwidth, NULL,
28762876
{(char_u *)1L, (char_u *)0L} SCTX_INIT},
28772877
{"winptydll", NULL, P_STRING|P_EXPAND|P_VI_DEF|P_SECURE,

src/testdir/test_goto.vim

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -296,6 +296,7 @@ func Test_gd_string()
296296
return x;
297297
}
298298
[CODE]
299+
299300
call XTest_goto_decl('gd', lines, 4, 7)
300301
endfunc
301302

@@ -320,14 +321,14 @@ func Test_set_options_keep_col()
320321
let pos = getcurpos()
321322
normal j
322323
set invhlsearch spell spelllang=en,cjk spelloptions=camel textwidth=80
323-
set cursorline cursorcolumn cursorlineopt=line colorcolumn=+1
324+
set cursorline cursorcolumn cursorlineopt=line colorcolumn=+1 winfixbuf
324325
set background=dark
325326
set background=light
326327
normal k
327328
call assert_equal(pos, getcurpos())
328329
bwipe!
329330
set hlsearch& spell& spelllang& spelloptions& textwidth&
330-
set cursorline& cursorcolumn& cursorlineopt& colorcolumn&
331+
set cursorline& cursorcolumn& cursorlineopt& colorcolumn& winfixbuf&
331332
set background&
332333
endfunc
333334

src/version.c

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -704,6 +704,8 @@ static char *(features[]) =
704704

705705
static int included_patches[] =
706706
{ /* Add new patch number below this line */
707+
/**/
708+
594,
707709
/**/
708710
593,
709711
/**/

0 commit comments

Comments
 (0)