To: vim_dev@googlegroups.com Subject: Patch 8.0.1726 Fcc: outbox From: Bram Moolenaar Mime-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ------------ Patch 8.0.1726 (after 8.0.1724) Problem: Older MSVC doesn't support declarations halfway a block. Solution: Move the declaration back to the start of the block. Files: src/main.c *** ../vim-8.0.1725/src/main.c 2018-04-16 15:40:46.800498011 +0200 --- src/main.c 2018-04-16 17:05:53.903560867 +0200 *************** *** 1056,1061 **** --- 1056,1062 ---- int cmdwin, /* TRUE when working in the command-line window */ int noexmode) /* TRUE when return on entering Ex mode */ { + oparg_T oa; /* operator arguments */ volatile int previous_got_int = FALSE; /* "got_int" was TRUE */ #ifdef FEAT_CONCEAL /* these are static to avoid a compiler warning */ *************** *** 1095,1101 **** } #endif - oparg_T oa; /* operator arguments */ clear_oparg(&oa); while (!cmdwin #ifdef FEAT_CMDWIN --- 1096,1101 ---- *************** *** 1383,1393 **** void getout(int exitval) { - tabpage_T *tp; - tabpage_T *next_tp; - buf_T *buf; - win_T *wp; - exiting = TRUE; #if defined(FEAT_JOB_CHANNEL) ch_log(NULL, "Exiting..."); --- 1383,1388 ---- *************** *** 1416,1421 **** --- 1411,1421 ---- if (v_dying <= 1) { + tabpage_T *tp; + tabpage_T *next_tp; + buf_T *buf; + win_T *wp; + /* Trigger BufWinLeave for all windows, but only once per buffer. */ for (tp = first_tabpage; tp != NULL; tp = next_tp) { *** ../vim-8.0.1725/src/version.c 2018-04-16 16:21:43.962795866 +0200 --- src/version.c 2018-04-16 17:05:36.615685537 +0200 *************** *** 764,765 **** --- 764,767 ---- { /* Add new patch number below this line */ + /**/ + 1726, /**/ -- hundred-and-one symptoms of being an internet addict: 201. When somebody asks you where you are, you tell them in which chat room. /// 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 ///