To: vim_dev@googlegroups.com Subject: Patch 8.1.1808 Fcc: outbox From: Bram Moolenaar Mime-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ------------ Patch 8.1.1808 Problem: Build failure for tiny version. Solution: Define ex_eval to ex_ni. Clean up the ordering a bit. Files: src/ex_docmd.c *** ../vim-8.1.1807/src/ex_docmd.c 2019-08-01 14:26:53.196455837 +0200 --- src/ex_docmd.c 2019-08-04 15:26:43.196067929 +0200 *************** *** 161,170 **** # 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 --- 161,166 ---- *************** *** 269,310 **** 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_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_endwhile ex_ni ! # define ex_throw ex_ni ! # define ex_try ex_ni ! # define ex_catch ex_ni # define ex_finally ex_ni ! # define ex_endtry ex_ni ! # define ex_endfunction 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 #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 --- 265,313 ---- static void ex_tag(exarg_T *eap); static void ex_tag_cmd(exarg_T *eap, char_u *name); #ifndef FEAT_EVAL ! # 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_else ex_ni ! # define ex_endfunction ex_ni ! # define ex_endif ex_ni ! # define ex_endtry ex_ni # define ex_endwhile ex_ni ! # define ex_eval ex_ni ! # define ex_execute ex_ni # define ex_finally ex_ni ! # define ex_finish ex_ni ! # define ex_function ex_ni ! # define ex_if ex_ni # define ex_let ex_ni # define ex_lockvar 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_VIMINFO # define ex_viminfo ex_ni #endif *************** *** 321,329 **** #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 --- 324,329 ---- *************** *** 356,369 **** # 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 --- 356,361 ---- *** ../vim-8.1.1807/src/version.c 2019-08-04 15:03:33.367303750 +0200 --- src/version.c 2019-08-04 15:27:22.891845857 +0200 *************** *** 775,776 **** --- 775,778 ---- { /* Add new patch number below this line */ + /**/ + 1808, /**/ -- hundred-and-one symptoms of being an internet addict: 27. You refer to your age as 3.x. /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\ /// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\ \\\ an exciting new programming language -- http://www.Zimbu.org /// \\\ help me help AIDS victims -- http://ICCF-Holland.org ///