aniani/vim
0
0
Fork 1
mirror of https://github.com/vim/vim.git synced 2025-09-23 03:43:49 -04:00
Code Activity

patch 8.1.2371: FEAT_TEXT_PROP is a confusing name

Browse Source 
Problem:    FEAT_TEXT_PROP is a confusing name.
Solution:   Use FEAT_PROP_POPUP. (Naruhiko Nishino, closes #5291)
This commit is contained in:
Bram Moolenaar
2019-11-30 22:48:27 +01:00
parent 0c5c3faef2
commit 05ad5ff0ab
47 changed files with 190 additions and 178 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/evalwindow.c
View File

@@ -103,7 +103,7 @@ win_id2wp_tp(int id, tabpage_T **tpp)
*tpp = tp;
return wp;
}
#ifdef FEAT_TEXT_PROP
#ifdef FEAT_PROP_POPUP
// popup windows are in separate lists
FOR_ALL_TABPAGES(tp)
for (wp = tp->tp_first_popupwin; wp != NULL; wp = wp->w_next)
@@ -181,7 +181,7 @@ find_win_by_nr(
}
if (nr >= LOWEST_WIN_ID)
{
#ifdef FEAT_TEXT_PROP
#ifdef FEAT_PROP_POPUP
// check tab-local popup windows
for (wp = tp->tp_first_popupwin; wp != NULL; wp = wp->w_next)
if (wp->w_id == nr)
@@ -199,6 +199,7 @@ find_win_by_nr(
/*
* Find a window: When using a Window ID in any tab page, when using a number
* in the current tab page.
* Returns NULL when not found.
*/
win_T *
find_win_by_nr_or_id(typval_T *vp)
@@ -1137,7 +1138,7 @@ restore_win_noblock(
curwin = save_curwin;
curbuf = curwin->w_buffer;
}
# ifdef FEAT_TEXT_PROP
# ifdef FEAT_PROP_POPUP
else if (WIN_IS_POPUP(curwin))
// original window was closed and now we're in a popup window: Go
// to the first valid window.