updated for version 7.4.480

Problem:    MS-Windows: Can't build.
Solution:   Remove goto, use a flag instead.

diff --git a/src/os_win32.c b/src/os_win32.c
index a831ada54ca9170ce06d93b24f1e5b93538af22f..c03b963c4fe5796ecd1206580e98486b1a68c548 100644 (file)
--- 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 3388fafec61dacb154c196f4c6910d77cb96d549..01fdef61c7a7b931c44bf8ba390817f78665aa25 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -741,6 +741,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    480,
 /**/
     479,
 /**/