summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2019-01-22 22:55:00 +0100
committerBram Moolenaar <Bram@vim.org>2019-01-22 22:55:00 +0100
commitf88af6e6757b2e373cf6cd366d6a81a066a6ade0 (patch)
tree21fbb26a21113897fe2969c85a213398ca864325 /src
parent82a12468bd023f5cdc5d27182bedef7881514643 (diff)
patch 8.1.0795: cannot build without popup menuv8.1.0795
Problem: Cannot build without popup menu. Solution: Add #ifdef
Diffstat (limited to 'src')
-rw-r--r--src/ex_getln.c2
-rw-r--r--src/version.c2
2 files changed, 4 insertions, 0 deletions
diff --git a/src/ex_getln.c b/src/ex_getln.c
index 9400b20e82..f7dfc32ddc 100644
--- a/src/ex_getln.c
+++ b/src/ex_getln.c
@@ -7268,9 +7268,11 @@ open_cmdwin(void)
/* Don't execute autocommands while creating the window. */
block_autocmds();
+#if defined(FEAT_INS_EXPAND)
// When using completion in Insert mode with <C-R>=<C-F> one can open the
// command line window, but we don't want the popup menu then.
pum_undisplay();
+#endif
/* don't use a new tab page */
cmdmod.tab = 0;
diff --git a/src/version.c b/src/version.c
index fc926196c2..91b3542620 100644
--- a/src/version.c
+++ b/src/version.c
@@ -792,6 +792,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 795,
+/**/
794,
/**/
793,