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/popupmenu.c | |
| parent | 0c5c3faef2d54151a8c144539e3e5a3350fb18c7 (diff) | |
| download | vim-git-05ad5ff0ab34ed9a5296dedd420ca81698b8ce22.tar.gz | |
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/popupmenu.c')
| -rw-r--r-- | src/popupmenu.c | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/src/popupmenu.c b/src/popupmenu.c index 11dd1865f..f11ae943a 100644 --- a/src/popupmenu.c +++ b/src/popupmenu.c @@ -429,7 +429,7 @@ pum_redraw(void) / (pum_size - pum_height); } -#ifdef FEAT_TEXT_PROP +#ifdef FEAT_PROP_POPUP // The popup menu is drawn over popup menus with zindex under // POPUPMENU_ZINDEX. screen_zindex = POPUPMENU_ZINDEX; @@ -616,12 +616,12 @@ pum_redraw(void) ++row; } -#ifdef FEAT_TEXT_PROP +#ifdef FEAT_PROP_POPUP screen_zindex = 0; #endif } -#if defined(FEAT_TEXT_PROP) && defined(FEAT_QUICKFIX) +#if defined(FEAT_PROP_POPUP) && defined(FEAT_QUICKFIX) /* * Position the info popup relative to the popup menu item. */ @@ -683,7 +683,7 @@ pum_set_selected(int n, int repeat UNUSED) #ifdef FEAT_QUICKFIX int prev_selected = pum_selected; #endif -#ifdef FEAT_TEXT_PROP +#ifdef FEAT_PROP_POPUP int has_info = FALSE; #endif @@ -758,12 +758,12 @@ pum_set_selected(int n, int repeat UNUSED) win_T *curwin_save = curwin; tabpage_T *curtab_save = curtab; int res = OK; -# ifdef FEAT_TEXT_PROP +# ifdef FEAT_PROP_POPUP use_popup_T use_popup; # else # define use_popup USEPOPUP_NONE # endif -# ifdef FEAT_TEXT_PROP +# ifdef FEAT_PROP_POPUP has_info = TRUE; if (strstr((char *)p_cot, "popuphidden") != NULL) use_popup = USEPOPUP_HIDDEN; @@ -787,7 +787,7 @@ pum_set_selected(int n, int repeat UNUSED) g_do_tagpreview = 0; if (curwin->w_p_pvw -# ifdef FEAT_TEXT_PROP +# ifdef FEAT_PROP_POPUP || (curwin->w_popup_flags & POPF_INFO) # endif ) @@ -862,7 +862,7 @@ pum_set_selected(int n, int repeat UNUSED) curbuf->b_p_ma = FALSE; if (pum_selected != prev_selected) { -# ifdef FEAT_TEXT_PROP +# ifdef FEAT_PROP_POPUP curwin->w_firstline = 1; # endif curwin->w_topline = 1; @@ -871,7 +871,7 @@ pum_set_selected(int n, int repeat UNUSED) curwin->w_topline = curbuf->b_ml.ml_line_count; curwin->w_cursor.lnum = curwin->w_topline; curwin->w_cursor.col = 0; -# ifdef FEAT_TEXT_PROP +# ifdef FEAT_PROP_POPUP if (use_popup != USEPOPUP_NONE) { pum_position_info_popup(curwin); @@ -916,13 +916,13 @@ pum_set_selected(int n, int repeat UNUSED) if (!resized && win_valid(curwin_save)) { -# ifdef FEAT_TEXT_PROP +# ifdef FEAT_PROP_POPUP win_T *wp = curwin; # endif ++no_u_sync; win_enter(curwin_save, TRUE); --no_u_sync; -# ifdef FEAT_TEXT_PROP +# ifdef FEAT_PROP_POPUP if (use_popup == USEPOPUP_HIDDEN && win_valid(wp)) popup_hide(wp); # endif @@ -937,7 +937,7 @@ pum_set_selected(int n, int repeat UNUSED) } } } -# if defined(FEAT_TEXT_PROP) && defined(FEAT_QUICKFIX) +# if defined(FEAT_PROP_POPUP) && defined(FEAT_QUICKFIX) if (WIN_IS_POPUP(curwin)) // can't keep focus in a popup window win_enter(firstwin, TRUE); @@ -945,7 +945,7 @@ pum_set_selected(int n, int repeat UNUSED) } #endif } -#if defined(FEAT_TEXT_PROP) && defined(FEAT_QUICKFIX) +#if defined(FEAT_PROP_POPUP) && defined(FEAT_QUICKFIX) if (!has_info) // hide any popup info window popup_hide_info(); @@ -967,7 +967,7 @@ pum_undisplay(void) redraw_all_later(NOT_VALID); redraw_tabline = TRUE; status_redraw_all(); -#if defined(FEAT_TEXT_PROP) && defined(FEAT_QUICKFIX) +#if defined(FEAT_PROP_POPUP) && defined(FEAT_QUICKFIX) // hide any popup info window popup_hide_info(); #endif |