diff options
| author | Bram Moolenaar <Bram@vim.org> | 2018-04-16 15:40:50 +0200 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2018-04-16 15:40:50 +0200 |
| commit | 06965b838f3677251668dca726b07c5ad2499341 (patch) | |
| tree | 3f6180251b66bb84e9084727945554fdfcf4b19e | |
| parent | f3a411783c9736645d6ba480c5ff9d861164c040 (diff) | |
patch 8.0.1724: declarations cannot be halfway a blockv8.0.1724
Problem: Declarations cannot be halfway a block.
Solution: Move one declaration to check if this works for all compilers.
| -rw-r--r-- | src/main.c | 2 | ||||
| -rw-r--r-- | src/version.c | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/src/main.c b/src/main.c index 6d351b6ff3..a773122a89 100644 --- 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 diff --git a/src/version.c b/src/version.c index bdd1a3d7e5..f81bcfab94 100644 --- 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, |