aniani/vim
0
0
Fork 1
mirror of https://github.com/vim/vim.git synced 2025-09-26 04:04:07 -04:00
Code Activity

patch 8.0.1726: older MSVC doesn't support declarations halfway a block

Browse Source 
Problem:    Older MSVC doesn't support declarations halfway a block.
Solution:   Move the declaration back to the start of the block.
This commit is contained in:
Bram Moolenaar
2018-04-16 17:06:09 +02:00
parent 32c67ba733
commit df2c774ded
2 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/main.c
View File

@@ -1056,6 +1056,7 @@ main_loop(
int cmdwin, /* TRUE when working in the command-line window */ int cmdwin, /* TRUE when working in the command-line window */
int noexmode) /* TRUE when return on entering Ex mode */ int noexmode) /* TRUE when return on entering Ex mode */
{ {
oparg_T oa; /* operator arguments */
volatile int previous_got_int = FALSE; /* "got_int" was TRUE */ volatile int previous_got_int = FALSE; /* "got_int" was TRUE */
#ifdef FEAT_CONCEAL #ifdef FEAT_CONCEAL
/* these are static to avoid a compiler warning */ /* these are static to avoid a compiler warning */
@@ -1095,7 +1096,6 @@ main_loop(
} }
#endif #endif
oparg_T oa; /* operator arguments */
clear_oparg(&oa); clear_oparg(&oa);
while (!cmdwin while (!cmdwin
#ifdef FEAT_CMDWIN #ifdef FEAT_CMDWIN
@@ -1383,11 +1383,6 @@ getout_preserve_modified(int exitval)
void void
getout(int exitval) getout(int exitval)
{ {
tabpage_T *tp;
tabpage_T *next_tp;
buf_T *buf;
win_T *wp;
exiting = TRUE; exiting = TRUE;
#if defined(FEAT_JOB_CHANNEL) #if defined(FEAT_JOB_CHANNEL)
ch_log(NULL, "Exiting..."); ch_log(NULL, "Exiting...");
@@ -1416,6 +1411,11 @@ getout(int exitval)
if (v_dying <= 1) 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. */ /* Trigger BufWinLeave for all windows, but only once per buffer. */
for (tp = first_tabpage; tp != NULL; tp = next_tp) for (tp = first_tabpage; tp != NULL; tp = next_tp)
{ {

2
src/version.c
View File

@@ -762,6 +762,8 @@ static char *(features[]) =
static int included_patches[] = static int included_patches[] =
{ /* Add new patch number below this line */ { /* Add new patch number below this line */
/**/
1726,
/**/ /**/
1725, 1725,
/**/ /**/