Mercurial > vim
diff src/ex_docmd.c @ 13392:d5347779fb20 v8.0.1570
patch 8.0.1570: can't use :popup for a menu in the terminal
commit https://github.com/vim/vim/commit/29a2c08d792e4458a0af8371f5341394829fce29
Author: Bram Moolenaar <Bram@vim.org>
Date: Mon Mar 5 21:06:23 2018 +0100
patch 8.0.1570: can't use :popup for a menu in the terminal
Problem: Can't use :popup for a menu in the terminal. (Wei Zhang)
Solution: Make :popup work in the terminal. Also fix that entries were
included that don't work in the current state.
| author | Christian Brabandt <cb@256bit.org> |
|---|---|
| date | Mon, 05 Mar 2018 21:15:05 +0100 |
| parents | 6740c499de13 |
| children | fa198b71bab2 |
line wrap: on
line diff
--- a/src/ex_docmd.c +++ b/src/ex_docmd.c @@ -204,7 +204,8 @@ static void ex_tearoff(exarg_T *eap); #else # define ex_tearoff ex_ni #endif -#if (defined(FEAT_GUI_MSWIN) || defined(FEAT_GUI_GTK)) && defined(FEAT_MENU) +#if (defined(FEAT_GUI_MSWIN) || defined(FEAT_GUI_GTK) \ + || defined(FEAT_TERM_POPUP_MENU)) && defined(FEAT_MENU) static void ex_popup(exarg_T *eap); #else # define ex_popup ex_ni @@ -8741,11 +8742,21 @@ ex_tearoff(exarg_T *eap) } #endif -#if (defined(FEAT_GUI_MSWIN) || defined(FEAT_GUI_GTK)) && defined(FEAT_MENU) +#if (defined(FEAT_GUI_MSWIN) || defined(FEAT_GUI_GTK) \ + || defined(FEAT_TERM_POPUP_MENU)) && defined(FEAT_MENU) static void ex_popup(exarg_T *eap) { - gui_make_popup(eap->arg, eap->forceit); +# if defined(FEAT_GUI_MSWIN) || defined(FEAT_GUI_GTK) + if (gui.in_use) + gui_make_popup(eap->arg, eap->forceit); +# ifdef FEAT_TERM_POPUP_MENU + else +# endif +# endif +# ifdef FEAT_TERM_POPUP_MENU + pum_make_popup(eap->arg, eap->forceit); +# endif } #endif