diff options
| author | Bram Moolenaar <Bram@vim.org> | 2014-10-16 16:16:37 +0200 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2014-10-16 16:16:37 +0200 |
| commit | 799d6abf3ec600dbb92cdcd5c25985efea053c09 (patch) | |
| tree | 6d7b66e827785576ebd0e6eb2dd75dbe53a29ac1 | |
| parent | 7d76c804af900ba6dcc4b1e45373ccab3418c6b2 (diff) | |
| download | vim-git-799d6abf3ec600dbb92cdcd5c25985efea053c09.tar.gz | |
updated for version 7.4.480v7.4.480
Problem: MS-Windows: Can't build.
Solution: Remove goto, use a flag instead.
| -rw-r--r-- | src/os_win32.c | 32 | ||||
| -rw-r--r-- | src/version.c | 2 |
2 files changed, 19 insertions, 15 deletions
diff --git a/src/os_win32.c b/src/os_win32.c index a831ada54..c03b963c4 100644 --- a/src/os_win32.c +++ b/src/os_win32.c @@ -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(); diff --git a/src/version.c b/src/version.c index 3388fafec..01fdef61c 100644 --- a/src/version.c +++ b/src/version.c @@ -742,6 +742,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 480, +/**/ 479, /**/ 478, |