diff options
| author | Bram Moolenaar <Bram@vim.org> | 2016-02-23 18:55:43 +0100 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2016-02-23 18:55:43 +0100 |
| commit | 0106e3d0bf8a38351af45331cbf3b9172a6bb90b (patch) | |
| tree | 8bc142ad7ff048dee9bcd0ddeb200327e34bd972 /src | |
| parent | 9892189d2e7ab94b750f99e6da4cbfc3c8014517 (diff) | |
patch 7.4.1403v7.4.1403
Problem: Can't build without the quickfix feature.
Solution: Add #ifdefs. Call ex_ni() for unimplemented commands. (Yegappan
Lakshmanan)
Diffstat (limited to 'src')
| -rw-r--r-- | src/ex_cmds2.c | 11 | ||||
| -rw-r--r-- | src/popupmnu.c | 6 | ||||
| -rw-r--r-- | src/version.c | 2 |
3 files changed, 18 insertions, 1 deletions
diff --git a/src/ex_cmds2.c b/src/ex_cmds2.c index ec20daaeb1..3f8c50816c 100644 --- a/src/ex_cmds2.c +++ b/src/ex_cmds2.c @@ -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 diff --git a/src/popupmnu.c b/src/popupmnu.c index 47cda947cf..eb6a58b4a3 100644 --- a/src/popupmnu.c +++ b/src/popupmnu.c @@ -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) diff --git a/src/version.c b/src/version.c index 94f7b36e77..e5ba6585b9 100644 --- a/src/version.c +++ b/src/version.c @@ -749,6 +749,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 1403, +/**/ 1402, /**/ 1401, |