Skip to content

Commit 5f3d00a

Browse files
janlazobrammool
andauthored
vim-patch:8.1.2371: FEAT_TEXT_PROP is a confusing name (neovim#35466)
Problem: FEAT_TEXT_PROP is a confusing name. Solution: Use FEAT_PROP_POPUP. (Naruhiko Nishino, closes vim/vim#5291) vim/vim@05ad5ff 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 <[email protected]>
1 parent 58060c2 commit 5f3d00a

File tree

4 files changed

+8
-2
lines changed

4 files changed

+8
-2
lines changed

src/nvim/eval/window.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -177,6 +177,7 @@ win_T *find_win_by_nr(typval_T *vp, tabpage_T *tp)
177177

178178
/// Find a window: When using a Window ID in any tab page, when using a number
179179
/// in the current tab page.
180+
/// Returns NULL when not found.
180181
win_T *find_win_by_nr_or_id(typval_T *vp)
181182
{
182183
int nr = (int)tv_get_number_chk(vp, NULL);

src/nvim/getchar.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2675,7 +2675,7 @@ static int vgetorpeek(bool advance)
26752675

26762676
if (result == map_result_get) {
26772677
// get a character: 2. from the typeahead buffer
2678-
c = typebuf.tb_buf[typebuf.tb_off] & 255;
2678+
c = typebuf.tb_buf[typebuf.tb_off];
26792679
if (advance) { // remove chars from tb_buf
26802680
cmd_silent = (typebuf.tb_silent > 0);
26812681
if (typebuf.tb_maplen > 0) {

test/old/testdir/runtest.vim

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -375,6 +375,11 @@ func RunTheTest(test)
375375
au!
376376
au SwapExists * call HandleSwapExists()
377377

378+
" Close any stray popup windows
379+
if has('popupwin')
380+
call popup_clear()
381+
endif
382+
378383
" Close any extra tab pages and windows and make the current one not modified.
379384
while tabpagenr('$') > 1
380385
let winid = win_getid()

test/old/testdir/test_execute_func.vim

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,7 @@ func Test_win_execute()
9999
let line = win_execute(134343, 'echo getline(1)')
100100
call assert_equal('', line)
101101

102-
if has('textprop')
102+
if has('popupwin')
103103
let popupwin = popup_create('the popup win', {'line': 2, 'col': 3})
104104
redraw
105105
let line = 'echo getline(1)'->win_execute(popupwin)

0 commit comments

Comments
 (0)