# HG changeset patch # User Bram Moolenaar # Date 1580592603 -3600 # Node ID c7903f92ed75efdebf80a9efd1c275969a792a5c # Parent 4bb646771aefb902a5f74c225c6c7f732386d1a8 patch 8.2.0192: build failure without +terminal feature Commit: https://github.com/vim/vim/commit/91cd59a0a20b944f703ca65e67f2e637fbb7e812 Author: Bram Moolenaar Date: Sat Feb 1 22:18:37 2020 +0100 patch 8.2.0192: build failure without +terminal feature Problem: Build failure without +terminal feature. Solution: Add #ifdefs. diff --git a/src/popupwin.c b/src/popupwin.c --- a/src/popupwin.c +++ b/src/popupwin.c @@ -2029,9 +2029,11 @@ popup_create(typval_T *argvars, typval_T redraw_all_later(NOT_VALID); popup_mask_refresh = TRUE; +#ifdef FEAT_TERMINAL // When running a terminal in the popup it becomes the current window. if (buf->b_term != NULL) win_enter(wp, FALSE); +#endif return wp; } @@ -2109,12 +2111,14 @@ popup_close_and_callback(win_T *wp, typv { int id = wp->w_id; +#ifdef FEAT_TERMINAL if (wp == curwin && curbuf->b_term != NULL) { // Closing popup window with a terminal: put focus back on the previous // window. win_enter(prevwin, FALSE); } +#endif // Just in case a check higher up is missing. if (wp == curwin && ERROR_IF_POPUP_WINDOW) @@ -2846,7 +2850,11 @@ error_if_popup_window() // win_execute() may set "curwin" to a popup window temporarily, but many // commands are disallowed then. When a terminal runs in the popup most // things are allowed. - if (WIN_IS_POPUP(curwin) && curbuf->b_term == NULL) + if (WIN_IS_POPUP(curwin) +# ifdef FEAT_TERMINAL + && curbuf->b_term == NULL +# endif + ) { emsg(_("E994: Not allowed in a popup window")); return TRUE; @@ -2854,6 +2862,7 @@ error_if_popup_window() return FALSE; } +# if defined(FEAT_TERMINAL) || defined(PROTO) int error_if_term_popup_window() { @@ -2864,6 +2873,7 @@ error_if_term_popup_window() } return FALSE; } +# endif /* * Reset all the "handled_flag" flags in global popup windows and popup windows @@ -2984,9 +2994,11 @@ popup_do_filter(int c) int state; int was_must_redraw = must_redraw; +#ifdef FEAT_TERMINAL // Popup window with terminal always gets focus. if (popup_is_popup(curwin) && curbuf->b_term != NULL) return FALSE; +#endif if (recursive) return FALSE; diff --git a/src/version.c b/src/version.c --- a/src/version.c +++ b/src/version.c @@ -743,6 +743,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 192, +/**/ 191, /**/ 190,