patch 7.4.1403
Problem: Can't build without the quickfix feature.
Solution: Add #ifdefs. Call ex_ni() for unimplemented commands. (Yegappan
Lakshmanan)
diff --git a/src/ex_cmds2.c b/src/ex_cmds2.c
index ec20daa..3f8c508 100644
--- a/src/ex_cmds2.c
+++ b/src/ex_cmds2.c
@@ -2442,7 +2442,7 @@
}
}
-#ifdef FEAT_LISTCMDS
+#if defined(FEAT_LISTCMDS) || defined(PROTO)
/*
* ":argedit"
*/
@@ -2565,6 +2565,15 @@
}
#endif
+#ifndef FEAT_QUICKFIX
+ if (eap->cmdidx == CMD_cdo || eap->cmdidx == CMD_ldo ||
+ eap->cmdidx == CMD_cfdo || eap->cmdidx == CMD_lfdo)
+ {
+ ex_ni(eap);
+ return;
+ }
+#endif
+
#if defined(FEAT_AUTOCMD) && defined(FEAT_SYN_HL)
if (eap->cmdidx != CMD_windo && eap->cmdidx != CMD_tabdo)
/* Don't do syntax HL autocommands. Skipping the syntax file is a
diff --git a/src/popupmnu.c b/src/popupmnu.c
index 47cda94..eb6a58b 100644
--- a/src/popupmnu.c
+++ b/src/popupmnu.c
@@ -75,16 +75,20 @@
row = curwin->w_wrow + W_WINROW(curwin);
+#if defined(FEAT_WINDOWS) && defined(FEAT_QUICKFIX)
if (firstwin->w_p_pvw)
top_clear = firstwin->w_height;
else
+#endif
top_clear = 0;
+#if defined(FEAT_WINDOWS) && defined(FEAT_QUICKFIX)
/* When the preview window is at the bottom stop just above it. Also
* avoid drawing over the status line so that it's clear there is a window
* boundary. */
if (lastwin->w_p_pvw)
above_row -= lastwin->w_height + lastwin->w_status_height + 1;
+#endif
/*
* Figure out the size and position of the pum.
@@ -149,6 +153,7 @@
if (pum_height < 1 || (pum_height == 1 && size > 1))
return;
+#if defined(FEAT_WINDOWS) && defined(FEAT_QUICKFIX)
/* If there is a preview window at the top avoid drawing over it. */
if (firstwin->w_p_pvw
&& pum_row < firstwin->w_height
@@ -157,6 +162,7 @@
pum_row += firstwin->w_height;
pum_height -= firstwin->w_height;
}
+#endif
/* Compute the width of the widest match and the widest extra. */
for (i = 0; i < size; ++i)
diff --git a/src/version.c b/src/version.c
index 94f7b36..e5ba658 100644
--- a/src/version.c
+++ b/src/version.c
@@ -749,6 +749,8 @@
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 1403,
+/**/
1402,
/**/
1401,
