diff options
| author | Bram Moolenaar <Bram@vim.org> | 2019-11-30 22:48:27 +0100 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2019-11-30 22:48:27 +0100 |
| commit | 05ad5ff0ab34ed9a5296dedd420ca81698b8ce22 (patch) | |
| tree | 7354d352e37ab28988ce26e4f88efd9a9b9f71ec /src/evalwindow.c | |
| parent | 0c5c3faef2d54151a8c144539e3e5a3350fb18c7 (diff) | |
patch 8.1.2371: FEAT_TEXT_PROP is a confusing namev8.1.2371
Problem: FEAT_TEXT_PROP is a confusing name.
Solution: Use FEAT_PROP_POPUP. (Naruhiko Nishino, closes #5291)
Diffstat (limited to 'src/evalwindow.c')
| -rw-r--r-- | src/evalwindow.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/evalwindow.c b/src/evalwindow.c index 76916936dc..34d202e0ad 100644 --- a/src/evalwindow.c +++ b/src/evalwindow.c @@ -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. |