mirrors/neovim
1
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2025-09-06 03:18:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

vim-patch:8.1.2371: FEAT_TEXT_PROP is a confusing name (#35466)

Browse Source 
Problem:    FEAT_TEXT_PROP is a confusing name.
Solution:   Use FEAT_PROP_POPUP. (Naruhiko Nishino, closes vim/vim#5291)

05ad5ff0ab

textprop,popuwin remain N/A features.
getchar.c has the relevant code changes.

Port runtest.vim changes from patch v8.1.1561.

Co-authored-by: Bram Moolenaar <Bram@vim.org>
This commit is contained in:
Jan Edmund Lazo
2025-08-25 03:16:16 -04:00
committed by GitHub
parent 58060c2340
commit 5f3d00a5a6
4 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/nvim/eval/window.c
View File

@@ -177,6 +177,7 @@ win_T *find_win_by_nr(typval_T *vp, tabpage_T *tp)
/// Find a window: When using a Window ID in any tab page, when using a number /// Find a window: When using a Window ID in any tab page, when using a number
/// in the current tab page. /// in the current tab page.
/// Returns NULL when not found.
win_T *find_win_by_nr_or_id(typval_T *vp) win_T *find_win_by_nr_or_id(typval_T *vp)
{ {
int nr = (int)tv_get_number_chk(vp, NULL); int nr = (int)tv_get_number_chk(vp, NULL);

2
src/nvim/getchar.c
View File

@@ -2675,7 +2675,7 @@ static int vgetorpeek(bool advance)
if (result == map_result_get) { if (result == map_result_get) {
// get a character: 2. from the typeahead buffer // get a character: 2. from the typeahead buffer
c = typebuf.tb_buf[typebuf.tb_off] & 255; c = typebuf.tb_buf[typebuf.tb_off];
if (advance) { // remove chars from tb_buf if (advance) { // remove chars from tb_buf
cmd_silent = (typebuf.tb_silent > 0); cmd_silent = (typebuf.tb_silent > 0);
if (typebuf.tb_maplen > 0) { if (typebuf.tb_maplen > 0) {

5
test/old/testdir/runtest.vim
View File

@@ -375,6 +375,11 @@ func RunTheTest(test)
au! au!
au SwapExists * call HandleSwapExists() au SwapExists * call HandleSwapExists()
" Close any stray popup windows
if has('popupwin')
call popup_clear()
endif
" Close any extra tab pages and windows and make the current one not modified. " Close any extra tab pages and windows and make the current one not modified.
while tabpagenr('$') > 1 while tabpagenr('$') > 1
let winid = win_getid() let winid = win_getid()

2
test/old/testdir/test_execute_func.vim
View File

@@ -99,7 +99,7 @@ func Test_win_execute()
let line = win_execute(134343, 'echo getline(1)') let line = win_execute(134343, 'echo getline(1)')
call assert_equal('', line) call assert_equal('', line)
if has('textprop') if has('popupwin')
let popupwin = popup_create('the popup win', {'line': 2, 'col': 3}) let popupwin = popup_create('the popup win', {'line': 2, 'col': 3})
redraw redraw
let line = 'echo getline(1)'->win_execute(popupwin) let line = 'echo getline(1)'->win_execute(popupwin)