aniani/vim
0
0
Fork 1
mirror of https://github.com/vim/vim.git synced 2025-09-23 03:43:49 -04:00
Code Activity

updated for version 7.4.480

Browse Source 
Problem:    MS-Windows: Can't build.
Solution:   Remove goto, use a flag instead.
This commit is contained in:
Bram Moolenaar
2014-10-16 16:16:37 +02:00
parent 7d76c804af
commit 799d6abf3e
2 changed files with 19 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
src/os_win32.c
View File

@@ -4646,9 +4646,10 @@ mch_call_shell(
int x = 0;
int tmode = cur_tmode;
#ifdef FEAT_TITLE
char szShellTitle[512];
char szShellTitle[512];
# ifdef FEAT_MBYTE
int did_set_title = FALSE;
/* Change the title to reflect that we are in a subshell. */
if (enc_codepage >= 0 && (int)GetACP() != enc_codepage)
{
@@ -4671,25 +4672,26 @@ mch_call_shell(
wcscat(szShellTitle, wn);
SetConsoleTitleW(szShellTitle);
vim_free(wn);
goto didset;
did_set_title = TRUE;
}
}
}
}
#endif
/* Change the title to reflect that we are in a subshell. */
if (GetConsoleTitle(szShellTitle, sizeof(szShellTitle) - 4) > 0)
{
if (cmd == NULL)
strcat(szShellTitle, " :sh");
else
if (!did_set_title)
# endif
/* Change the title to reflect that we are in a subshell. */
if (GetConsoleTitle(szShellTitle, sizeof(szShellTitle) - 4) > 0)
{
strcat(szShellTitle, " - !");
if ((strlen(szShellTitle) + strlen(cmd) < sizeof(szShellTitle)))
strcat(szShellTitle, cmd);
if (cmd == NULL)
strcat(szShellTitle, " :sh");
else
{
strcat(szShellTitle, " - !");
if ((strlen(szShellTitle) + strlen(cmd) < sizeof(szShellTitle)))
strcat(szShellTitle, cmd);
}
SetConsoleTitle(szShellTitle);
}
SetConsoleTitle(szShellTitle);
}
#endif
out_flush();

2
src/version.c
View File

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