diff options
| author | Bram Moolenaar <Bram@vim.org> | 2019-08-04 15:30:16 +0200 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2019-08-04 15:30:16 +0200 |
| commit | e4ce825a55ad2445a212ce30837a3af566b7af6b (patch) | |
| tree | 7358389d0fbd3d494ae0ad8bc8e2df3a7c899782 /src | |
| parent | 25e42231d3ee27feec2568fa4be2aa2bfba82ae5 (diff) | |
| download | vim-git-e4ce825a55ad2445a212ce30837a3af566b7af6b.tar.gz | |
patch 8.1.1808: build failure for tiny versionv8.1.1808
Problem: Build failure for tiny version.
Solution: Define ex_eval to ex_ni. Clean up the ordering a bit.
Diffstat (limited to 'src')
| -rw-r--r-- | src/ex_docmd.c | 68 | ||||
| -rw-r--r-- | src/version.c | 2 |
2 files changed, 32 insertions, 38 deletions
diff --git a/src/ex_docmd.c b/src/ex_docmd.c index 514985633..3cd615a1f 100644 --- a/src/ex_docmd.c +++ b/src/ex_docmd.c @@ -161,10 +161,6 @@ static void ex_popup(exarg_T *eap); # define ex_syntax ex_ni # define ex_ownsyntax ex_ni #endif -#ifndef FEAT_EVAL -# define ex_packadd ex_ni -# define ex_packloadall ex_ni -#endif #if !defined(FEAT_SYN_HL) || !defined(FEAT_PROFILE) # define ex_syntime ex_ni #endif @@ -269,42 +265,49 @@ static void ex_psearch(exarg_T *eap); static void ex_tag(exarg_T *eap); static void ex_tag_cmd(exarg_T *eap, char_u *name); #ifndef FEAT_EVAL -# define ex_scriptnames ex_ni -# define ex_finish ex_ni +# define ex_break ex_ni +# define ex_breakadd ex_ni +# define ex_breakdel ex_ni +# define ex_breaklist ex_ni +# define ex_call ex_ni +# define ex_catch ex_ni +# define ex_compiler ex_ni +# define ex_const ex_ni +# define ex_continue ex_ni +# define ex_debug ex_ni +# define ex_debuggreedy ex_ni +# define ex_delfunction ex_ni # define ex_echo ex_ni # define ex_echohl ex_ni -# define ex_execute ex_ni -# define ex_call ex_ni -# define ex_if ex_ni -# define ex_endif ex_ni # define ex_else ex_ni -# define ex_while ex_ni -# define ex_continue ex_ni -# define ex_break ex_ni +# define ex_endfunction ex_ni +# define ex_endif ex_ni +# define ex_endtry ex_ni # define ex_endwhile ex_ni -# define ex_throw ex_ni -# define ex_try ex_ni -# define ex_catch ex_ni +# define ex_eval ex_ni +# define ex_execute ex_ni # define ex_finally ex_ni -# define ex_endtry ex_ni -# define ex_endfunction ex_ni +# define ex_finish ex_ni +# define ex_function ex_ni +# define ex_if ex_ni # define ex_let ex_ni -# define ex_const ex_ni -# define ex_unlet ex_ni # define ex_lockvar ex_ni -# define ex_unlockvar ex_ni -# define ex_function ex_ni -# define ex_delfunction ex_ni -# define ex_return ex_ni # define ex_oldfiles ex_ni +# define ex_options ex_ni +# define ex_packadd ex_ni +# define ex_packloadall ex_ni +# define ex_return ex_ni +# define ex_scriptnames ex_ni +# define ex_throw ex_ni +# define ex_try ex_ni +# define ex_unlet ex_ni +# define ex_unlockvar ex_ni +# define ex_while ex_ni #endif static char_u *arg_all(void); #ifndef FEAT_SESSION # define ex_loadview ex_ni #endif -#ifndef FEAT_EVAL -# define ex_compiler ex_ni -#endif #ifndef FEAT_VIMINFO # define ex_viminfo ex_ni #endif @@ -321,9 +324,6 @@ static void ex_setfiletype(exarg_T *eap); #endif static void ex_digraphs(exarg_T *eap); static void ex_set(exarg_T *eap); -#if !defined(FEAT_EVAL) -# define ex_options ex_ni -#endif #ifdef FEAT_SEARCH_EXTRA static void ex_nohlsearch(exarg_T *eap); #else @@ -356,14 +356,6 @@ static void ex_folddo(exarg_T *eap); # define ex_nbstart ex_ni #endif -#ifndef FEAT_EVAL -# define ex_debug ex_ni -# define ex_breakadd ex_ni -# define ex_debuggreedy ex_ni -# define ex_breakdel ex_ni -# define ex_breaklist ex_ni -#endif - #ifndef FEAT_CMDHIST # define ex_history ex_ni #endif diff --git a/src/version.c b/src/version.c index 1c13c064b..80e0ce1cf 100644 --- a/src/version.c +++ b/src/version.c @@ -774,6 +774,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 1808, +/**/ 1807, /**/ 1806, |