To: vim_dev@googlegroups.com Subject: Patch 8.2.1229 Fcc: outbox From: Bram Moolenaar Mime-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ------------ Patch 8.2.1229 Problem: Build error without the eval feature. Solution: Declare starts_with_colon. Make function local. Files: src/ex_docmd.c, src/proto/ex_docmd.pro *** ../vim-8.2.1228/src/ex_docmd.c 2020-07-17 20:35:00.857574357 +0200 --- src/ex_docmd.c 2020-07-17 20:46:53.676163318 +0200 *************** *** 1649,1655 **** return nr; } ! int comment_start(char_u *p, int starts_with_colon UNUSED) { #ifdef FEAT_EVAL --- 1649,1655 ---- return nr; } ! static int comment_start(char_u *p, int starts_with_colon UNUSED) { #ifdef FEAT_EVAL *************** *** 1708,1715 **** int save_reg_executing = reg_executing; int ni; // set when Not Implemented char_u *cmd; #ifdef FEAT_EVAL - int starts_with_colon; int starts_with_quote; int vim9script = in_vim9script(); #endif --- 1708,1715 ---- int save_reg_executing = reg_executing; int ni; // set when Not Implemented char_u *cmd; + int starts_with_colon = FALSE; #ifdef FEAT_EVAL int starts_with_quote; int vim9script = in_vim9script(); #endif *** ../vim-8.2.1228/src/proto/ex_docmd.pro 2020-07-17 20:35:00.857574357 +0200 --- src/proto/ex_docmd.pro 2020-07-17 20:47:01.756144023 +0200 *************** *** 5,11 **** int getline_equal(char_u *(*fgetline)(int, void *, int, int), void *cookie, char_u *(*func)(int, void *, int, int)); void *getline_cookie(char_u *(*fgetline)(int, void *, int, int), void *cookie); char_u *getline_peek(char_u *(*fgetline)(int, void *, int, int), void *cookie); - int comment_start(char_u *p, int starts_with_colon); int parse_command_modifiers(exarg_T *eap, char **errormsg, int skip_only); void undo_cmdmod(exarg_T *eap, int save_msg_scroll); int parse_cmd_address(exarg_T *eap, char **errormsg, int silent); --- 5,10 ---- *** ../vim-8.2.1228/src/version.c 2020-07-17 20:43:37.292617041 +0200 --- src/version.c 2020-07-17 20:47:27.044083337 +0200 *************** *** 756,757 **** --- 756,759 ---- { /* Add new patch number below this line */ + /**/ + 1229, /**/ -- hundred-and-one symptoms of being an internet addict: 32. You don't know what sex three of your closest friends are, because they have neutral nicknames and you never bothered to ask. /// 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 ///