changeset 13704:e7b8c896fa96 v8.0.1724

patch 8.0.1724: declarations cannot be halfway a block commit https://github.com/vim/vim/commit/06965b838f3677251668dca726b07c5ad2499341 Author: Bram Moolenaar <Bram@vim.org> Date: Mon Apr 16 15:40:50 2018 +0200 patch 8.0.1724: declarations cannot be halfway a block Problem: Declarations cannot be halfway a block. Solution: Move one declaration to check if this works for all compilers.
author Christian Brabandt <cb@256bit.org>
date Mon, 16 Apr 2018 15:45:06 +0200
parents d309b1140319
children 7dd71a906267
files src/main.c src/version.c
diffstat 2 files changed, 3 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/src/main.c
+++ b/src/main.c
@@ -1056,7 +1056,6 @@ main_loop(
     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 */
@@ -1096,6 +1095,7 @@ main_loop(
     }
 #endif
 
+    oparg_T	oa;	/* operator arguments */
     clear_oparg(&oa);
     while (!cmdwin
 #ifdef FEAT_CMDWIN
--- a/src/version.c
+++ b/src/version.c
@@ -763,6 +763,8 @@ static char *(features[]) =
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    1724,
+/**/
     1723,
 /**/
     1722,