0
0
mirror of https://github.com/vim/vim.git synced 2025-07-26 11:04:33 -04:00

patch 7.4.1403

Problem:    Can't build without the quickfix feature.
Solution:   Add #ifdefs. Call ex_ni() for unimplemented commands. (Yegappan
            Lakshmanan)
This commit is contained in:
Bram Moolenaar 2016-02-23 18:55:43 +01:00
parent 9892189d2e
commit 0106e3d0bf
3 changed files with 18 additions and 1 deletions

View File

@ -2442,7 +2442,7 @@ ex_next(exarg_T *eap)
}
}
#ifdef FEAT_LISTCMDS
#if defined(FEAT_LISTCMDS) || defined(PROTO)
/*
* ":argedit"
*/
@ -2565,6 +2565,15 @@ ex_listdo(exarg_T *eap)
}
#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

View File

@ -75,16 +75,20 @@ redo:
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 @@ redo:
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 @@ redo:
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)

View File

@ -748,6 +748,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
1403,
/**/
1402,
/**/