mirror of
https://github.com/vim/vim.git
synced 2025-07-25 10:54:51 -04:00
patch 9.1.1255: missing test condition for 'pummaxwidth' setting
Problem: missing test condition for 'pummaxwidth' setting, pummaxwidth not effective when width is 32 and height is 10 (after v9.1.1250) Solution: add missing comparison condition in pum_width() (glepnir) closes: #16999 Signed-off-by: glepnir <glephunter@gmail.com> Signed-off-by: Christian Brabandt <cb@256bit.org>
This commit is contained in:
parent
aa68f8a095
commit
532c5aec6f
@ -1,7 +1,7 @@
|
|||||||
" These commands create the option window.
|
" These commands create the option window.
|
||||||
"
|
"
|
||||||
" Maintainer: The Vim Project <https://github.com/vim/vim>
|
" Maintainer: The Vim Project <https://github.com/vim/vim>
|
||||||
" Last Change: 2025 Mar 27
|
" Last Change: 2025 Mar 28
|
||||||
" Former Maintainer: Bram Moolenaar <Bram@vim.org>
|
" Former Maintainer: Bram Moolenaar <Bram@vim.org>
|
||||||
|
|
||||||
" If there already is an option window, jump to that one.
|
" If there already is an option window, jump to that one.
|
||||||
@ -863,7 +863,7 @@ if has("insert_expand")
|
|||||||
call <SID>OptionG("ph", &ph)
|
call <SID>OptionG("ph", &ph)
|
||||||
call <SID>AddOption("pumwidth", gettext("minimum width of the popup menu"))
|
call <SID>AddOption("pumwidth", gettext("minimum width of the popup menu"))
|
||||||
call <SID>OptionG("pw", &pw)
|
call <SID>OptionG("pw", &pw)
|
||||||
call <SID>AddOption("pumaxmwidth", gettext("maximum width of the popup menu"))
|
call <SID>AddOption("pummaxwidth", gettext("maximum width of the popup menu"))
|
||||||
call <SID>OptionG("pmw", &pmw)
|
call <SID>OptionG("pmw", &pmw)
|
||||||
call <SID>AddOption("completefunc", gettext("user defined function for Insert mode completion"))
|
call <SID>AddOption("completefunc", gettext("user defined function for Insert mode completion"))
|
||||||
call append("$", "\t" .. s:local_to_buffer)
|
call append("$", "\t" .. s:local_to_buffer)
|
||||||
|
@ -342,6 +342,10 @@ pum_display(
|
|||||||
if (p_pmw > 0 && pum_width > p_pmw)
|
if (p_pmw > 0 && pum_width > p_pmw)
|
||||||
pum_width = p_pmw;
|
pum_width = p_pmw;
|
||||||
}
|
}
|
||||||
|
else if (p_pmw > 0 && pum_width > p_pmw)
|
||||||
|
{
|
||||||
|
pum_width = p_pmw;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
10
src/testdir/dumps/Test_pum_maxwidth_09.dump
Normal file
10
src/testdir/dumps/Test_pum_maxwidth_09.dump
Normal file
@ -0,0 +1,10 @@
|
|||||||
|
|1+0&#ffffff0|2|3|4|5|6|7|8|9|_|1|2|3|4|5|6|7|8|9|_|1|2|3|4|5|6|7|8|9|_|a|
|
||||||
|
|1|2|3|4|5|6|7|8|9|_|1|2|3|4|5|6|7|8|9|_|1|2|3|4|5|6|7|8|9|_|b|
|
||||||
|
@12|1|2|3|4|5|6|7|8|9|_|1|2|3|4|5|6|7|8|9|_
|
||||||
|
|1|2|3|4|5|6|7|8|9|_|a> @20
|
||||||
|
|~+0#4040ff13&| @9| +0#0000001#e0e0e08|1|2|3|4|5|.@2| +0#4040ff13#ffffff0@11
|
||||||
|
|~| @9| +0#0000001#ffd7ff255|1|2|3|4|5|.@2| +0#4040ff13#ffffff0@11
|
||||||
|
|~| @30
|
||||||
|
|~| @30
|
||||||
|
|~| @30
|
||||||
|
|-+2#0000000&@1| |m+0#00e0003&|a|t|c|h| |1| |o|f| |2| +0#0000000&@16
|
@ -2017,6 +2017,11 @@ func Test_pum_maxwidth()
|
|||||||
call VerifyScreenDump(buf, 'Test_pum_maxwidth_04', {'rows': 8})
|
call VerifyScreenDump(buf, 'Test_pum_maxwidth_04', {'rows': 8})
|
||||||
call term_sendkeys(buf, "\<Esc>3Gdd\"zp")
|
call term_sendkeys(buf, "\<Esc>3Gdd\"zp")
|
||||||
|
|
||||||
|
call term_sendkeys(buf, ":set lines=10 columns=32\<CR>")
|
||||||
|
call term_sendkeys(buf, "GA\<C-N>")
|
||||||
|
call VerifyScreenDump(buf, 'Test_pum_maxwidth_09', {'rows': 10, 'cols': 32})
|
||||||
|
call term_sendkeys(buf, "\<Esc>3Gdd\"zp")
|
||||||
|
|
||||||
call StopVimInTerminal(buf)
|
call StopVimInTerminal(buf)
|
||||||
endfunc
|
endfunc
|
||||||
|
|
||||||
|
@ -704,6 +704,8 @@ static char *(features[]) =
|
|||||||
|
|
||||||
static int included_patches[] =
|
static int included_patches[] =
|
||||||
{ /* Add new patch number below this line */
|
{ /* Add new patch number below this line */
|
||||||
|
/**/
|
||||||
|
1255,
|
||||||
/**/
|
/**/
|
||||||
1254,
|
1254,
|
||||||
/**/
|
/**/
|
||||||
|
Loading…
x
Reference in New Issue
Block a user