diff options
| author | Bram Moolenaar <Bram@vim.org> | 2018-04-16 17:06:09 +0200 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2018-04-16 17:06:09 +0200 |
| commit | df2c774ded4c2ed169390a352099c23b6db657c4 (patch) | |
| tree | d7054b0965cb86fe63c1988288fcc8d9eb5a9b7c | |
| parent | 32c67ba733abcd4f2d729595fdccb2295445636a (diff) | |
| download | vim-git-df2c774ded4c2ed169390a352099c23b6db657c4.tar.gz | |
patch 8.0.1726: older MSVC doesn't support declarations halfway a blockv8.0.1726
Problem: Older MSVC doesn't support declarations halfway a block.
Solution: Move the declaration back to the start of the block.
| -rw-r--r-- | src/main.c | 12 | ||||
| -rw-r--r-- | src/version.c | 2 |
2 files changed, 8 insertions, 6 deletions
diff --git a/src/main.c b/src/main.c index a773122a8..3b366b507 100644 --- a/src/main.c +++ b/src/main.c @@ -1056,6 +1056,7 @@ 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 */ @@ -1095,7 +1096,6 @@ main_loop( } #endif - oparg_T oa; /* operator arguments */ clear_oparg(&oa); while (!cmdwin #ifdef FEAT_CMDWIN @@ -1383,11 +1383,6 @@ getout_preserve_modified(int exitval) 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..."); @@ -1416,6 +1411,11 @@ getout(int exitval) 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) { diff --git a/src/version.c b/src/version.c index f3143fe97..ba093c56f 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 */ /**/ + 1726, +/**/ 1725, /**/ 1724, |