To: vim_dev@googlegroups.com Subject: Patch 8.0.1724 Fcc: outbox From: Bram Moolenaar Mime-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ------------ Patch 8.0.1724 Problem: Declarations cannot be halfway a block. Solution: Move one declaration to check if this works for all compilers. Files: src/main.c *** ../vim-8.0.1723/src/main.c 2018-04-10 18:47:16.093527046 +0200 --- src/main.c 2018-04-16 15:38:30.429374793 +0200 *************** *** 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 */ --- 1056,1061 ---- *************** *** 1096,1101 **** --- 1095,1101 ---- } #endif + oparg_T oa; /* operator arguments */ clear_oparg(&oa); while (!cmdwin #ifdef FEAT_CMDWIN *** ../vim-8.0.1723/src/version.c 2018-04-16 14:45:41.020162889 +0200 --- src/version.c 2018-04-16 15:38:08.481514153 +0200 *************** *** 764,765 **** --- 764,767 ---- { /* Add new patch number below this line */ + /**/ + 1724, /**/ -- Some of the well known MS-Windows errors: EMULTI Multitasking attempted, system confused EKEYBOARD Keyboard locked, try getting out of this one! EXPLAIN Unexplained error, please tell us what happened EFUTURE Reserved for our future mistakes /// 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 ///