Mercurial > vim
changeset 6293:e3149e2b4152 v7.4.480
updated for version 7.4.480
Problem: MS-Windows: Can't build.
Solution: Remove goto, use a flag instead.
| author | Bram Moolenaar <bram@vim.org> |
|---|---|
| date | Thu, 16 Oct 2014 16:16:37 +0200 |
| parents | 31f7581068a9 |
| children | 67d6321314df |
| files | src/os_win32.c src/version.c |
| diffstat | 2 files changed, 19 insertions(+), 15 deletions(-) [+] |
line wrap: on
line diff
--- 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();