To: vim_dev@googlegroups.com Subject: Patch 7.4.2009 Fcc: outbox From: Bram Moolenaar Mime-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ------------ Patch 7.4.2009 (after 7.4.2008) Problem: Messages test fails. Solution: Don't set redir_execute before returning. Add missing version number. Files: src/eval.c *** ../vim-7.4.2008/src/eval.c 2016-07-09 17:05:49.203222428 +0200 --- src/eval.c 2016-07-09 17:32:54.263074518 +0200 *************** *** 11445,11455 **** return; } - if (redir_execute) - save_ga = redir_execute_ga; - ga_init2(&redir_execute_ga, (int)sizeof(char), 500); - redir_execute = TRUE; - if (argvars[1].v_type != VAR_UNKNOWN) { char_u buf[NUMBUFLEN]; --- 11445,11450 ---- *************** *** 11468,11473 **** --- 11463,11473 ---- else ++msg_silent; + if (redir_execute) + save_ga = redir_execute_ga; + ga_init2(&redir_execute_ga, (int)sizeof(char), 500); + redir_execute = TRUE; + if (cmd != NULL) do_cmdline_cmd(cmd); else *************** *** 21169,21176 **** if (argvars[0].v_type != VAR_NUMBER) { ! EMSG(_(e_number_exp)); ! return; } timer = find_timer((int)get_tv_number(&argvars[0])); if (timer != NULL) --- 21169,21176 ---- if (argvars[0].v_type != VAR_NUMBER) { ! EMSG(_(e_number_exp)); ! return; } timer = find_timer((int)get_tv_number(&argvars[0])); if (timer != NULL) *** ../vim-7.4.2008/src/version.c 2016-07-09 15:38:27.149081854 +0200 --- src/version.c 2016-07-09 17:36:55.243490578 +0200 *************** *** 760,761 **** --- 760,765 ---- { /* Add new patch number below this line */ + /**/ + 2009, + /**/ + 2008, /**/ -- "Marriage is the process of finding out what kind of man your wife would have preferred" /// 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 ///